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
cicada.c
davicom.c
fixed.c
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
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
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
qsemi.c
realtek.c
smsc.c
vitesse.c