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
broadcom.c	tg3 / broadcom: Optionally disable TXC if no link	2009-11-02 23:39:15 -08:00
cicada.c
davicom.c
et1011c.c
fixed.c
icplus.c
Kconfig
lxt.c
Makefile
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
mdio-bitbang.c
mdio-gpio.c	net: fix mdio section mismatch warning	2009-11-17 04:04:40 -08:00
national.c
phy_device.c
phy.c
qsemi.c
realtek.c
smsc.c
ste10Xp.c
vitesse.c