David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
amd.c
aquantia.c
at803x.c
bcm7xxx.c
bcm63xx.c
bcm87xx.c
bcm-cygnus.c
bcm-phy-lib.c
bcm-phy-lib.h
broadcom.c
cicada.c
davicom.c
dp83640_reg.h
dp83640.c
dp83848.c
dp83867.c
et1011c.c
fixed_phy.c
icplus.c
intel-xway.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
lxt.c
Makefile	net: phy: Sort Makefile and Kconfig	2016-08-19 17:11:50 -07:00
marvell.c	Marvell phy: add functions to suspend and resume both interfaces: fiber and copper links.	2016-07-19 16:05:56 -07:00
mdio_bus.c
mdio_device.c
mdio-bcm-iproc.c
mdio-bcm-unimac.c
mdio-bitbang.c
mdio-cavium.c
mdio-cavium.h
mdio-gpio.c
mdio-hisi-femac.c	net: Add MDIO bus driver for the Hisilicon FEMAC	2016-07-16 21:32:58 -07:00
mdio-moxart.c
mdio-mux-bcm-iproc.c
mdio-mux-gpio.c
mdio-mux-mmioreg.c
mdio-mux.c
mdio-octeon.c
mdio-sun4i.c
mdio-thunder.c
mdio-xgene.c	drivers: net: phy: xgene: Remove redundant dev_err call in xgene_mdio_probe()	2016-07-30 20:39:12 -07:00
mdio-xgene.h	drivers: net: phy: xgene: Add MDIO driver	2016-07-25 21:51:43 -07:00
micrel.c	phy: micrel: Reenable interrupts during resume for ksz9031	2016-08-23 16:56:54 -07:00
microchip.c
mscc.c	net: phy: Fixed checkpatch errors for Microsemi PHYs.	2016-09-09 18:16:10 -07:00
national.c
phy_device.c
phy.c	Revert "phy: IRQ cannot be shared"	2016-08-25 16:53:47 -07:00
qsemi.c
realtek.c
smsc.c
spi_ks8995.c
ste10Xp.c
swphy.c
swphy.h
teranetics.c
vitesse.c
xilinx_gmii2rgmii.c	net: phy: xgmiitorgmii: Fix non static symbol warning	2016-08-23 17:17:48 -07:00