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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

2008-06-10 02:22:26 -07:00

..

bitfield.h

sfc: Use DMA_BIT_MASK() instead of our own DMA mask macros

2008-05-22 05:59:30 -04:00

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

sfc: Use __packed macro

2008-05-22 05:59:32 -04:00

falcon_io.h

sfc: Replaced various macros with inline functions

2008-05-22 05:59:27 -04:00

falcon_xmac.c

[netdrvr] sfc: Report XAUI link down at default log level

2008-05-30 22:06:47 -04:00

falcon.c

sfc: Reduce I2C udelay to 5 resulting in a clock frequency of 100 kHz

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

falcon.h

sfc: Replaced various macros with inline functions

2008-05-22 05:59:27 -04:00

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

sfc: Remove redundant casts to and from void *

2008-05-22 05:59:33 -04:00

rx.h

…

selftest.c

sfc: Added checks for heap allocation failure

2008-05-22 05:59:34 -04:00

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

sfc: Added checks for heap allocation failure

2008-05-22 05:59:34 -04:00

tx.c

sfc: Replaced various macros with inline functions

2008-05-22 05:59:27 -04:00

tx.h

…

workarounds.h

sfc: Replaced various macros with inline functions

2008-05-22 05:59:27 -04:00

xenpack.h

…

xfp_phy.c

sfc: Added checks for heap allocation failure

2008-05-22 05:59:34 -04:00