David S. Miller 0ddead90b2 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>
2017-06-15 11:59:32 -04:00
..
2017-04-12 22:02:40 +02:00
2017-05-19 15:06:48 -07:00
2017-05-17 16:06:01 -04:00
2017-06-12 15:21:20 -04:00
2017-06-01 11:49:39 -04:00