kernel_optimize_test/drivers/net/sfc
Ingo Molnar 9d45cf9e36 Merge branch 'x86/urgent' into x86/apic
Conflicts:
	arch/x86/mach-default/setup.c

Semantic merge:
	arch/x86/kernel/irqinit_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-05 22:30:01 +01: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 'x86/urgent' into x86/apic 2009-02-05 22:30:01 +01:00
efx.h sfc: Replace stats_enabled flag with a disable count 2009-01-30 14:06:33 -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
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: Fix dependency for SFC_MTD 2008-11-20 04:17:42 -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 sfc: Replace stats_enabled flag with a disable count 2009-01-30 14:06:33 -08:00
phy.h sfc: SFX7101: Remove workaround for bad link training 2009-01-30 14:06:27 -08:00
rx.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
rx.h sfc: Remove some unreachable error paths 2008-09-03 09:53:48 -04: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 sfc: Replace stats_enabled flag with a disable count 2009-01-30 14:06:33 -08:00
spi.h sfc: Clean up waits for flash/EEPROM operations 2008-12-12 21:57:35 -08:00
tenxpress.c sfc: Replace stats_enabled flag with a disable count 2009-01-30 14:06:33 -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
xfp_phy.c sfc: Use model numbers for PHY type names 2008-12-12 22:06:54 -08:00