David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
Makefile	amd-xgbe: Add I2C support for sideband communication	2016-11-13 00:56:26 -05:00
xgbe-common.h	amd-xgbe: Add a hardware quirk for register definitions	2017-01-22 16:57:14 -05:00
xgbe-dcb.c	amd-xgbe: Do traffic class setup when called through dcbnl	2016-02-17 15:22:20 -05:00
xgbe-debugfs.c	amd-xgbe: Fix possible uninitialized variable	2016-11-16 13:57:44 -05:00
xgbe-desc.c	amd-xgbe: Fix DMA API debug warning	2015-07-08 15:57:14 -07:00
xgbe-dev.c	amd-xgbe: Check xgbe_init() return code	2017-01-22 16:57:14 -05:00
xgbe-drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
xgbe-ethtool.c	net: xgbe: use new api ethtool_{get|set}_link_ksettings	2016-11-09 13:25:13 -05:00
xgbe-i2c.c	amd-xgbe: Add I2C support for sideband communication	2016-11-13 00:56:26 -05:00
xgbe-main.c	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-12-12 19:56:15 -08:00
xgbe-mdio.c	amd-xgbe: Fix mask appliciation for Clause 37 register	2016-11-15 22:12:57 -05:00
xgbe-pci.c	amd-xgbe: Add a hardware quirk for register definitions	2017-01-22 16:57:14 -05:00
xgbe-phy-v1.c	amd-xgbe: Add support for a KR redriver	2016-11-13 00:56:26 -05:00
xgbe-phy-v2.c	amd-xgbe: Update connection validation for backplane mode	2016-11-18 12:28:09 -05:00
xgbe-platform.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-12-03 12:29:53 -05:00
xgbe-ptp.c	clocksource: Use a plain u64 instead of cycle_t	2016-12-25 11:04:12 +01:00
xgbe.h	amd-xgbe: Add a hardware quirk for register definitions	2017-01-22 16:57:14 -05:00