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

Conflicts:

	drivers/net/smc911x.c

2008-06-13 20:52:39 -07:00

..

bitfield.h

…

boards.c

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

boards.h

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

efx.c

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

efx.h

…

enum.h

…

ethtool.c

…

ethtool.h

…

falcon_hwdefs.h

…

falcon_io.h

…

falcon_xmac.c

…

falcon.c

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

2008-06-13 20:52:39 -07:00

falcon.h

…

gmii.h

…

Kconfig

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

mac.h

…

Makefile

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

mdio_10g.c

…

mdio_10g.h

…

net_driver.h

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

phy.h

…

rx.c

…

rx.h

…

selftest.c

…

selftest.h

…

sfe4001.c

sfc: Use kernel I2C system and i2c-algo-bit driver

2008-05-30 22:18:10 -04:00

spi.h

…

tenxpress.c

…

tx.c

…

tx.h

…

workarounds.h

…

xenpack.h

…

xfp_phy.c

…