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
..
e1000	e1000: remove set but not used variable 'txb2b'	2018-09-19 23:09:23 -07:00
e1000e	intel-ethernet: use correct module license	2018-09-18 15:32:59 -07:00
fm10k	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
i40e	intel-ethernet: use correct module license	2018-09-18 15:32:59 -07:00
iavf	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
ice	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
igb	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
igbvf	intel-ethernet: use correct module license	2018-09-18 15:32:59 -07:00
ixgb	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
ixgbe	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
ixgbevf	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
e100.c	intel-ethernet: use correct module license	2018-09-18 15:32:59 -07:00
Kconfig	intel-ethernet: rename i40evf to iavf	2018-09-18 08:43:03 -07:00
Makefile	intel-ethernet: rename i40evf to iavf	2018-09-18 08:43:03 -07:00