linux_dsm_epyc7002/drivers/net/ethernet/apm/xgene
David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-01 14:53:27 -04:00
..
Kconfig drivers: net: NET_XGENE should depend on HAS_DMA 2014-09-01 20:33:15 -07:00
Makefile drivers: net: xgene: Add SGMII based 1GbE support 2014-10-14 16:09:21 -04:00
xgene_enet_ethtool.c drivers: net: xgene: Add SGMII based 1GbE ethtool support 2014-10-14 16:09:22 -04:00
xgene_enet_hw.c drivers: net: xgene: Preparing for adding SGMII based 1GbE 2014-10-14 16:09:21 -04:00
xgene_enet_hw.h drivers: net: xgene: Add SGMII based 1GbE support 2014-10-14 16:09:21 -04:00
xgene_enet_main.c ethernet: apm: xgene: remove unnecessary check 2014-10-27 19:16:01 -04:00
xgene_enet_main.h drivers: net: xgene: Add SGMII based 1GbE support 2014-10-14 16:09:21 -04:00
xgene_enet_sgmac.c drivers: net: xgene: Rewrite buggy loop in xgene_enet_ecc_init() 2014-10-25 17:05:20 -04:00
xgene_enet_sgmac.h drivers: net: xgene: Add SGMII based 1GbE support 2014-10-14 16:09:21 -04:00
xgene_enet_xgmac.c drivers: net: xgene: Preparing for adding SGMII based 1GbE 2014-10-14 16:09:21 -04:00
xgene_enet_xgmac.h drivers: net: xgene: Add SGMII based 1GbE support 2014-10-14 16:09:21 -04:00