| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jun 15 11:31:37 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jun 15 11:59:32 2017 -0400 |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 | |
| parent | f7aec129a356ad049edddcb7e77b04a474fcf41f [diff] | |
| parent | a090bd4ff8387c409732a8e059fbf264ea0bdd56 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>