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

Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c

2010-12-17 12:27:22 -08:00

..

bcm63xx.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

broadcom.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

cicada.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

davicom.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

et1011c.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

fixed.c

…

icplus.c

phy: add the IC+ IP1001 driver

2010-12-10 15:48:43 -08:00

Kconfig

phy: add the IC+ IP1001 driver

2010-12-10 15:48:43 -08:00

lxt.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

Makefile

…

marvell.c

of/phylib: Use device tree properties to initialize Marvell PHYs.

2010-11-22 08:34:23 -08:00

mdio_bus.c

…

mdio-bitbang.c

…

mdio-gpio.c

…

mdio-octeon.c

…

micrel.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

national.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

phy_device.c

phylib: make local function static

2010-10-24 15:07:11 -07:00

phy.c

net: add some KERN_CONT markers to continuation lines

2010-11-28 10:47:17 -08:00

qsemi.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

realtek.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

smsc.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

ste10Xp.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

vitesse.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00