David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
bcm63xx.c	MIPS: BCM63XX: Add integrated ethernet PHY support for phylib.	2009-07-07 19:23:51 -07:00
broadcom.c	tg3 / broadcom: Optionally disable TXC if no link	2009-11-02 23:39:15 -08:00
cicada.c
davicom.c
et1011c.c	phy: Add LSI ET1011C PHY driver	2008-12-09 22:21:25 -08:00
fixed.c	phy: error handling for platform_device_register_simple()	2009-04-11 01:52:29 -07:00
icplus.c
Kconfig	MIPS: BCM63XX: Add integrated ethernet PHY support for phylib.	2009-07-07 19:23:51 -07:00
lxt.c
Makefile	MIPS: BCM63XX: Add integrated ethernet PHY support for phylib.	2009-07-07 19:23:51 -07:00
marvell.c	phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs	2009-09-11 12:54:38 -07:00
mdio_bus.c	phylib: rework to prepare for OF registration of PHYs	2009-04-27 02:53:45 -07:00
mdio-bitbang.c
mdio-gpio.c	net: fix mdio section mismatch warning	2009-11-17 04:04:40 -08:00
national.c	phy: Add file missed in previous commit.	2008-11-28 16:40:26 -08:00
phy_device.c	NET: phy_device, fix lock imbalance	2009-07-14 12:03:39 -07:00
phy.c	netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations	2009-09-03 20:02:11 -07:00
qsemi.c
realtek.c
smsc.c	phy: add new LAN8710 and LAN8720 device ids to smsc phy driver	2009-03-23 15:17:31 -07:00
ste10Xp.c	phy: add the ST ste10Xp PHYs	2008-11-28 16:42:41 -08:00
vitesse.c	phylib: Add Vitesse VSC8221 SGMII PHY	2008-11-25 01:00:47 -08:00