q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/net/phy
History
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
amd.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
bcm63xx.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
bcm87xx.c bcm87xx: fix reg-init comment typo 2012-07-09 00:11:46 -07:00
broadcom.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
cicada.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
davicom.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
dp83640.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
dp83640_reg.h ptp: Added a clock driver for the National Semiconductor PHYTER. 2011-05-23 13:10:23 -07:00
et1011c.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
fixed.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
icplus.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
Kconfig netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs 2012-06-27 21:23:25 -07:00
lxt.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
Makefile netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs 2012-06-27 21:23:25 -07:00
marvell.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
mdio-bitbang.c mdio-gpio: Add reset functionality to mdio-gpio driver(v2). 2011-11-15 16:56:17 -05:00
mdio-gpio.c irq_domain/x86: Convert x86 (embedded) to use common irq_domain 2012-02-23 14:37:47 -07:00
mdio-mux-gpio.c netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
mdio-mux.c netdev/phy: Fixup lockdep warnings in mdio-mux.c 2012-07-09 00:12:42 -07:00
mdio-octeon.c mdio-octeon: use an unique MDIO bus name. 2012-01-10 16:35:02 -08:00
mdio_bus.c netdev/phy/of: Add more methods for binding PHY devices to drivers. 2012-06-27 21:23:25 -07:00
micrel.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
national.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy.c phy: add the EEE support and the way to access to the MMD registers. 2012-07-01 03:34:50 -07:00
phy_device.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
qsemi.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
realtek.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
smsc.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
spi_ks8995.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
ste10Xp.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
vitesse.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00