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

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h

2010-01-10 22:55:03 -08:00

..

bcm63xx.c

…

broadcom.c

broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

2010-01-03 22:01:32 -08:00

cicada.c

…

davicom.c

…

et1011c.c

…

fixed.c

…

icplus.c

…

Kconfig

NET: Add driver for Octeon MDIO buses.

2009-12-17 01:56:58 +00:00

lxt.c

…

Makefile

NET: Add driver for Octeon MDIO buses.

2009-12-17 01:56:58 +00:00

marvell.c

…

mdio_bus.c

phylib: Properly reinitialize PHYs after hibernation

2009-12-30 22:03:42 -08:00

mdio-bitbang.c

…

mdio-gpio.c

…

mdio-octeon.c

NET: Add driver for Octeon MDIO buses.

2009-12-17 01:56:58 +00:00

national.c

…

phy_device.c

phylib: Properly reinitialize PHYs after hibernation

2009-12-30 22:03:42 -08:00

phy.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

qsemi.c

…

realtek.c

…

smsc.c

phy: SMSC device Energy Detect power-down mode

2010-01-06 20:35:14 -08:00

ste10Xp.c

…

vitesse.c

…