David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
Makefile	amd-xgbe: Add traffic class support	2014-07-30 18:46:53 -07:00
xgbe-common.h	amd-xgbe: Move the PHY support into amd-xgbe	2015-05-15 15:21:43 -04:00
xgbe-dcb.c	amd-xgbe: Add netif_* message support to the driver	2015-05-15 15:21:43 -04:00
xgbe-debugfs.c	amd-xgbe: Check for successful buffer allocation before use	2015-10-05 23:30:51 -07:00
xgbe-desc.c	amd-xgbe: Fix DMA API debug warning	2015-07-08 15:57:14 -07:00
xgbe-dev.c	amd-xgbe: fix a couple timeout loops	2015-12-15 12:43:01 -05:00
xgbe-drv.c	net: move skb_mark_napi_id() into core networking stack	2015-11-18 16:17:41 -05:00
xgbe-ethtool.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
xgbe-main.c	Merge branch 'acpi-pci'	2015-11-07 01:30:10 +01:00
xgbe-mdio.c	amd-xgbe: Remove the XGBE_LINK state bit	2015-10-05 03:23:27 -07:00
xgbe-ptp.c	ptp: xgbe: convert to the 64 bit get/set time methods.	2015-03-31 12:01:16 -04:00
xgbe.h	amd-xgbe: Remove the XGBE_LINK state bit	2015-10-05 03:23:27 -07:00