David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
e1000	e1000: fix possible reset_task running after adapter down	2013-11-30 00:02:12 -08:00
e1000e	Merge branch 'siocghwtstamp' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next	2013-12-05 19:45:14 -05:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
igbvf	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
ixgb	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
ixgbe	ixgbe: Start temperature sensor attribute index with 1	2013-12-17 22:43:07 -08:00
ixgbevf	ixgbevf: add DCB configuration into queue setup	2013-12-17 22:42:54 -08:00
e100.c	net: e100: remove unnecessary pci_set_drvdata()	2013-10-21 17:21:01 -04:00
Kconfig	ixgbevf: update Kconfig description	2013-12-10 01:27:33 -08:00
Makefile	i40e: include i40e in kernel proper	2013-09-11 02:28:40 -07:00