David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
amd.c
at803x.c
bcm63xx.c
bcm87xx.c
broadcom.c
cicada.c	net: phy: cicada: fix checkpath errors	2013-12-18 00:49:01 -05:00
davicom.c	net: phy: davicom: fix checkpath errors	2013-12-18 00:49:01 -05:00
dp83640_reg.h
dp83640.c	net: phy: dp83640: fix checkpath error	2013-12-18 00:49:02 -05:00
et1011c.c
fixed.c
icplus.c	net: phy: icplus: fix checkpath error	2013-12-18 00:49:02 -05:00
Kconfig
lxt.c	net: phy: lxt: fix checkpath errors	2013-12-18 00:49:02 -05:00
Makefile
marvell.c	net: phy: marvell: provide genphy suspend/resume	2013-12-17 14:42:44 -05:00
mdio_bus.c	net: phy: mdio_bus: fix checkpath error	2013-12-18 00:49:02 -05:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
national.c
phy_device.c	net: phy: fix checkpatch errors	2013-12-18 00:49:02 -05:00
phy.c	net: phy: fix checkpatch errors	2013-12-18 00:49:02 -05:00
qsemi.c
realtek.c	PHY: Add RTL8201CP phy_driver to realtek	2013-11-11 14:05:03 -05:00
smsc.c
spi_ks8995.c	net: phy: spi_ks8995: fix checkpatch errors	2013-12-18 00:49:02 -05:00
ste10Xp.c
vitesse.c	phy: Add Vitesse 8514 phy ID	2013-11-28 18:30:54 -05:00