David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-09-25 10:35:29 -07:00
..
2018-07-30 09:10:25 -07:00
2018-09-10 10:06:54 -07:00
2018-08-03 21:12:12 +02:00
2018-09-13 15:36:41 -07:00
2018-08-04 13:05:39 -07:00