David S. Miller 74d154189d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

2009-07-23 19:03:51 -07:00

..

bcm63xx.c

MIPS: BCM63XX: Add integrated ethernet PHY support for phylib.

2009-07-07 19:23:51 -07:00

broadcom.c

…

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

net/phy/marvell: update m88e1111 support for SGMII mode

2009-06-03 02:52:45 -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: Rework mdio-ofgpio driver to use of_mdio infrastructure

2009-07-23 10:56:48 -07: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

phylib: fixes for PHY_RESUMING state changes

2009-07-02 13:16:55 -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

…