kernel_optimize_test/drivers/net/phy
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
bcm63xx.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
broadcom.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
cicada.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
davicom.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
et1011c.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
fixed.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
icplus.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
Kconfig
lxt.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
Makefile
marvell.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
mdio_bus.c NET: Support clause 45 MDIO commands at the MDIO bus level 2010-03-16 21:23:42 -07:00
mdio-bitbang.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
mdio-gpio.c
mdio-octeon.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
national.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
phy_device.c phylib: Support phy module autoloading 2010-04-02 14:30:39 -07:00
phy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
qsemi.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
realtek.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
smsc.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
ste10Xp.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
vitesse.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00