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
..
Kconfig	netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs	2012-06-27 21:23:25 -07:00
Makefile	netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs	2012-06-27 21:23:25 -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	…
et1011c.c	…
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
lxt.c	phylib: Support registering a bunch of drivers	2012-07-09 00:10:56 -07:00
marvell.c	phylib: Support registering a bunch of drivers	2012-07-09 00:10:56 -07:00
mdio-bitbang.c	…
mdio-gpio.c	…
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_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	…
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