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

Conflicts:
	net/mac80211/rate.c

2010-02-14 22:30:54 -08:00

..

bitfield.h

…

efx.c

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

2010-02-14 22:30:54 -08:00

efx.h

sfc: Remove declarations of nonexistent functions

2010-02-03 19:12:46 -08:00

enum.h

…

ethtool.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

falcon_boards.c

…

falcon_gmac.c

…

falcon_xmac.c

…

falcon.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

io.h

…

Kconfig

…

mac.h

…

Makefile

…

mcdi_mac.c

…

mcdi_pcol.h

sfc: Update MCDI protocol definitions

2010-02-03 19:12:43 -08:00

mcdi_phy.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mcdi.c

sfc: Implement NVRAM selftest for SFC9000 family

2010-02-03 19:12:45 -08:00

mcdi.h

sfc: Implement NVRAM selftest for SFC9000 family

2010-02-03 19:12:45 -08:00

mdio_10g.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mdio_10g.h

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mtd.c

sfc: Use fixed-size buffers for MCDI NVRAM requests

2010-01-25 15:49:59 -08:00

net_driver.h

sfc: Do not include unneeded headers

2010-02-03 19:12:47 -08:00

nic.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

nic.h

…

phy.h

…

qt202x_phy.c

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

2010-02-14 22:30:54 -08:00

regs.h

…

rx.c

…

selftest.c

sfc: Do not include unneeded headers

2010-02-03 19:12:47 -08:00

selftest.h

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

siena.c

sfc: Add some missing bits to register self-test masks

2010-02-03 19:12:46 -08:00

spi.h

…

tenxpress.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

tx.c

…

workarounds.h

…