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

Conflicts:
	drivers/net/e1000/e1000_main.c

2009-01-30 14:31:07 -08:00

..

bitfield.h

sfc: Extend self-tests

2008-09-03 09:53:48 -04:00

boards.c

sfc: Add support for SFN4111T

2008-12-12 22:00:49 -08:00

boards.h

sfc: Add support for SFN4111T

2008-12-12 22:00:49 -08:00

efx.c

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

2009-01-30 14:31:07 -08:00

efx.h

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

2009-01-30 14:31:07 -08:00

enum.h

sfc: Add support for Solarflare 10Xpress SFT9001

2008-12-12 22:00:17 -08:00

ethtool.c

sfc: SFX7101/SFT9001: Fix AN advertisements

2009-01-30 14:06:32 -08:00

ethtool.h

New driver "sfc" for Solarstorm SFC4000 controller.

2008-04-29 01:42:43 -04:00

falcon_gmac.c

sfc: Rework MAC, PHY and board event handling

2008-12-12 21:59:24 -08:00

falcon_hwdefs.h

sfc: Add support for SFN4111T

2008-12-12 22:00:49 -08:00

falcon_io.h

sfc: Don't include net_driver.h from falcon_io.h

2008-09-24 18:54:38 -04:00

falcon_xmac.c

sfc: Rework MAC, PHY and board event handling

2008-12-12 21:59:24 -08:00

falcon.c

sfc: Replace stats_enabled flag with a disable count

2009-01-30 14:06:33 -08:00

falcon.h

sfc: Add support for sub-10G speeds

2008-12-12 21:58:17 -08:00

gmii.h

sfc: Remove MII extension cruft

2008-12-12 21:57:57 -08:00

Kconfig

sfc: Replace LRO with GRO

2009-01-21 14:34:06 -08:00

mac.h

sfc: Add support for sub-10G speeds

2008-12-12 21:58:17 -08:00

Makefile

sfc: Add support for sub-10G speeds

2008-12-12 21:58:17 -08:00

mdio_10g.c

sfc: SFX7101/SFT9001: Fix AN advertisements

2009-01-30 14:06:32 -08:00

mdio_10g.h

sfc: SFX7101/SFT9001: Fix AN advertisements

2009-01-30 14:06:32 -08:00

mtd.c

sfc: Clean up waits for flash/EEPROM operations

2008-12-12 21:57:35 -08:00

net_driver.h

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

2009-01-30 14:31:07 -08:00

phy.h

sfc: SFX7101: Remove workaround for bad link training

2009-01-30 14:06:27 -08:00

rx.c

net: Add skb_record_rx_queue() calls to multiqueue capable drivers.

2009-01-27 16:22:32 -08:00

rx.h

sfc: Replace LRO with GRO

2009-01-21 14:34:06 -08:00

selftest.c

sfc: Reinitialise the PHY completely in case of a PHY or NIC reset

2009-01-30 14:06:30 -08:00

selftest.h

sfc: Add support for multiple PHY self-tests

2008-12-26 13:47:25 -08:00

sfe4001.c

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

2009-01-30 14:31:07 -08:00

spi.h

sfc: Clean up waits for flash/EEPROM operations

2008-12-12 21:57:35 -08:00

tenxpress.c

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

2009-01-30 14:31:07 -08:00

tx.c

sfc: Use CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS where appropriate

2008-09-24 18:54:42 -04:00

tx.h

sfc: Remove some unreachable error paths

2008-09-03 09:53:48 -04:00

workarounds.h

sfc: SFX7101/SFT9001: Fix AN advertisements

2009-01-30 14:06:32 -08:00

xenpack.h

New driver "sfc" for Solarstorm SFC4000 controller.

2008-04-29 01:42:43 -04:00

xfp_phy.c

sfc: Use model numbers for PHY type names

2008-12-12 22:06:54 -08:00