linux/drivers/net/phy
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
amd.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
at803x.c net: phy: at803x: add suspend/resume callbacks 2013-09-27 17:28:32 -04:00
bcm63xx.c phy: bcm63xx: report Broadcom BCM63xx PHYs as internal 2013-05-27 22:42:50 -07:00
bcm87xx.c net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver 2012-09-22 15:33:46 -04:00
broadcom.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
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 phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
icplus.c net: phy: icplus: fix checkpath error 2013-12-18 00:49:02 -05:00
Kconfig phy: Add MOXA MDIO driver 2013-11-07 15:37:09 -05:00
lxt.c net: phy: lxt: fix checkpath errors 2013-12-18 00:49:02 -05:00
Makefile phy: Add MOXA MDIO driver 2013-11-07 15:37:09 -05:00
marvell.c net: phy: marvell: provide genphy suspend/resume 2013-12-17 14:42:44 -05:00
mdio_bus.c phylib: remove unused adjust_state() callback 2014-01-04 19:27:58 -05:00
mdio-bitbang.c Revert "drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free" 2012-11-14 22:32:15 -05:00
mdio-gpio.c net: mdio-gpio: use dev_get_platdata() 2013-08-30 17:43:39 -04:00
mdio-moxart.c phy: Add MOXA MDIO driver 2013-11-07 15:37:09 -05:00
mdio-mux-gpio.c net: mdio-mux-gpio: use dev_get_platdata() 2013-08-30 17:43:39 -04:00
mdio-mux-mmioreg.c net: phy: mdio: add missing __iomem annotation 2013-08-07 16:59:10 -07:00
mdio-mux.c netdev/phy: skip disabled mdio-mux nodes 2012-08-20 02:16:00 -07:00
mdio-octeon.c net: mdio-octeon: use platform_{get,set}_drvdata() 2013-09-03 22:38:46 -04:00
mdio-sun4i.c net: mdio-sun4i: Convert to devm_* api 2013-08-29 14:54:49 -04:00
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: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy_device.c phylib: make phy_scan_fixups() static 2014-01-04 19:27:58 -05:00
phy.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
qsemi.c
realtek.c PHY: Add RTL8201CP phy_driver to realtek 2013-11-11 14:05:03 -05:00
smsc.c net: phy: smsc: Fix config_init typo 2012-12-07 14:26:15 -05:00
spi_ks8995.c net: phy: spi_ks8995: fix checkpatch errors 2013-12-18 00:49:02 -05:00
ste10Xp.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
vitesse.c phy: Add Vitesse 8514 phy ID 2013-11-28 18:30:54 -05:00