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-08-25 13:40:38 -07:00
2018-08-23 14:09:37 -07:00
2018-09-18 15:12:51 +02:00
2018-09-23 13:32:19 +02:00
2018-08-23 14:55:01 -07:00