David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-24 06:54:12 -07:00
..
e1000	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
e1000e	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
fm10k	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
i40evf	i40evf: clean up local variable initialization	2015-10-23 05:37:00 -07:00
igb	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
igbvf	drivers/net/intel: use napi_complete_done()	2015-10-16 04:33:46 -07:00
ixgb	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
ixgbe	ixgbe, ixgbevf: Add new mbox API xcast mode	2015-10-23 05:52:26 -07:00
ixgbevf	ixgbe, ixgbevf: Add new mbox API xcast mode	2015-10-23 05:52:26 -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	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00