David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
e1000	e1000: fix possible reset_task running after adapter down	2013-11-30 00:02:12 -08:00
e1000e	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
i40e	i40e: Do not allow AQ calls from ndo-ops	2014-01-06 03:56:28 -08:00
i40evf	i40evf: A0 silicon specific	2013-12-31 16:39:42 -08:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
igbvf	net: igbvf: slight optimization of addr compare	2013-12-31 16:48:31 -05: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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05: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	i40e: Implementation of VXLAN ndo's	2014-01-03 20:11:44 -08:00
Makefile	i40evf: add driver to kernel build system	2013-12-31 16:27:49 -08:00