David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
i40e	Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue	2015-12-03 12:11:00 -05:00
i40evf	i40e: trivial fixes	2015-12-03 02:23:39 -08: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: Always turn PHY power on when requested	2015-12-03 02:45:13 -08:00
ixgbevf	ixgbevf: Handle extended IPv6 headers in Tx path	2015-12-03 02:45:14 -08:00
e100.c	e100: Release skb when DMA mapping is failed in e100_xmit_prepare	2015-08-18 14:06:05 -07:00
Kconfig	i40e: remove CONFIG_I40E_VXLAN	2015-12-03 02:23:35 -08:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00