David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
amd.c
at803x.c
bcm7xxx.c
bcm63xx.c
bcm87xx.c
broadcom.c
cicada.c
davicom.c
dp83640_reg.h
dp83640.c	dp83640: let the periodic pin from the module parameter be a default.	2014-03-21 14:21:15 -04:00
et1011c.c
fixed.c
icplus.c
Kconfig
lxt.c
Makefile
marvell.c
mdio_bus.c
mdio-bitbang.c
mdio-gpio.c
mdio-moxart.c
mdio-mux-gpio.c
mdio-mux-mmioreg.c
mdio-mux.c
mdio-octeon.c
mdio-sun4i.c
micrel.c	micrel: fix masking off LED bits	2014-03-19 17:41:50 -04:00
national.c
phy_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
phy.c
qsemi.c
realtek.c
smsc.c
spi_ks8995.c
ste10Xp.c
vitesse.c