David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-09 17:41:41 -04:00
e1000e	e1000e: call ndo_stop() instead of dev_close() when running offline selftest	2016-04-06 14:05:24 -07:00
fm10k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
i40evf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
igb	Revert "igb: Fix a deadlock in igb_sriov_reinit"	2016-04-06 21:02:11 -07:00
igbvf	igbvf: remove "link is Up" message when registering mcast address	2016-02-24 15:45:50 -08:00
ixgb	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
ixgbe	ixgbe: protect vxlan_get_rx_port in ixgbe_service_task with rtnl_lock	2016-04-21 15:35:43 -04:00
ixgbevf	ixgbe/ixgbevf: Add support for bulk free in Tx cleanup & cleanup boolean logic	2016-04-07 15:55:25 -07:00
e100.c	e100: Release skb when DMA mapping is failed in e100_xmit_prepare	2015-08-18 14:06:05 -07:00
Kconfig	net: intel: remove dead links	2016-04-06 20:54:45 -07:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00