David S. Miller 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c		2008-11-20 16:44:00 -08:00
..
broadcom.c	broadcom: Add support for BCM50610	2008-11-03 16:56:51 -08:00
cicada.c
davicom.c
fixed.c	phylib: two dynamic mii_bus allocation fallout fixes	2008-10-09 09:45:04 -07:00
icplus.c
Kconfig	phylib: make mdio-gpio work without OF (v4)	2008-11-16 18:59:45 -08:00
lxt.c
Makefile	phylib: rename mdio-ofgpio to mdio-gpio	2008-11-16 18:59:24 -08:00
marvell.c	phy: Add support for Marvell 88E1118 PHY	2008-11-15 14:04:27 -08:00
mdio_bus.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-18 23:38:23 -08:00
mdio-bitbang.c	phylib: move to dynamic allocation of struct mii_bus	2008-10-08 16:29:57 -07:00
mdio-gpio.c	phylib: make mdio-gpio work without OF (v4)	2008-11-16 18:59:45 -08:00
phy_device.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-20 16:44:00 -08:00
phy.c	net: struct device - replace bus_id with dev_name(), dev_set_name()	2008-11-10 13:55:14 -08:00
qsemi.c
realtek.c
smsc.c	SMSC LAN911x and LAN921x vendor driver	2008-11-06 00:58:40 -05:00
vitesse.c