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-01 09:32:35 -07:00
2018-09-12 00:09:19 -07:00
2018-08-01 09:32:35 -07:00
2018-08-01 09:32:35 -07:00
2018-09-23 12:25:15 -07:00
2018-06-12 16:19:22 -07:00
2018-08-31 23:09:53 -07:00
2016-12-26 21:35:39 -05:00
2018-08-01 09:32:35 -07:00
2018-07-23 21:17:44 -07:00
2018-09-01 19:52:50 -07:00
2016-06-18 21:34:09 -07:00
2018-07-23 21:17:44 -07:00
2018-08-01 09:32:35 -07:00
2018-07-23 21:17:44 -07:00