David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
Makefile	net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support	2017-06-06 21:14:13 -04:00
amd.c	…
aquantia.c	…
at803x.c	…
bcm-cygnus.c	…
bcm-phy-lib.c	…
bcm-phy-lib.h	…
bcm7xxx.c	…
bcm63xx.c	…
bcm87xx.c	…
broadcom.c	net: phy: Remove residual magic from PHY drivers	2017-05-16 15:58:18 -04:00
cicada.c	…
cortina.c	net: phy: Add Cortina CS4340 driver	2017-05-30 12:42:27 -04:00
davicom.c	…
dp83640.c	…
dp83640_reg.h	…
dp83848.c	…
dp83867.c	…
et1011c.c	…
fixed_phy.c	…
icplus.c	…
intel-xway.c	…
lxt.c	…
marvell.c	net: phy: marvell: Show complete link partner advertising	2017-06-12 12:07:36 -04:00
marvell10g.c	net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support	2017-06-06 21:14:13 -04:00
mdio-bcm-iproc.c	…
mdio-bcm-unimac.c	…
mdio-bitbang.c	…
mdio-boardinfo.c	…
mdio-boardinfo.h	…
mdio-cavium.c	…
mdio-cavium.h	…
mdio-gpio.c	…
mdio-hisi-femac.c	…
mdio-moxart.c	…
mdio-mux-bcm-iproc.c	…
mdio-mux-gpio.c	…
mdio-mux-mmioreg.c	…
mdio-mux.c	mdio: mux: fix an incorrect less than zero error check using a u32	2017-06-05 17:45:51 -04:00
mdio-octeon.c	…
mdio-sun4i.c	…
mdio-thunder.c	…
mdio-xgene.c	drivers: net: phy: xgene: Add lock to protect mac access	2017-05-16 11:41:08 -04:00
mdio-xgene.h	drivers: net: phy: xgene: Add lock to protect mac access	2017-05-16 11:41:08 -04:00
mdio_bus.c	mdio_bus: use devm_gpiod_get_optional()	2017-06-13 12:56:42 -04:00
mdio_device.c	…
meson-gxl.c	…
micrel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
microchip.c	net: phy: Remove residual magic from PHY drivers	2017-05-16 15:58:18 -04:00
mscc.c	…
national.c	…
phy-c45.c	net: phy: split out 10G genphy support	2017-06-06 21:14:13 -04:00
phy-core.c	…
phy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
phy_device.c	net: phy: split out 10G genphy support	2017-06-06 21:14:13 -04:00
phy_led_triggers.c	…
qsemi.c	…
realtek.c	…
smsc.c	net: phy: smsc: Implement PHY statistics	2017-06-04 21:36:20 -04:00
spi_ks8995.c	…
ste10Xp.c	…
swphy.c	…
swphy.h	…
teranetics.c	…
vitesse.c	…
xilinx_gmii2rgmii.c	…