1
0
Fork 0
alistair23-linux/drivers/net/sfc
Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-27 17:28:43 +01:00
..
Kconfig sfc: Replace LRO with GRO 2009-01-21 14:34:06 -08:00
Makefile sfc: Add support for sub-10G speeds 2008-12-12 21:58:17 -08:00
bitfield.h net: replace uses of __constant_{endian} 2009-02-01 00:45:17 -08:00
boards.c sfc: Add support for SFN4112F SFP+ reference design 2009-03-02 03:15:07 -08:00
boards.h sfc: Add support for SFN4112F SFP+ reference design 2009-03-02 03:15:07 -08:00
efx.c Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
efx.h sfc: Implement adaptive IRQ moderation 2009-03-21 19:06:58 -07:00
enum.h sfc: Add support for Solarflare 10Xpress SFT9001 2008-12-12 22:00:17 -08:00
ethtool.c sfc: Implement adaptive IRQ moderation 2009-03-21 19:06:58 -07:00
ethtool.h
falcon.c Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
falcon.h sfc: Implement adaptive IRQ moderation 2009-03-21 19:06:58 -07: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: Optimise falcon_writel_page_locked() for page > 0 2009-03-21 19:06:56 -07:00
falcon_xmac.c sfc: Rework MAC, PHY and board event handling 2008-12-12 21:59:24 -08:00
gmii.h sfc: Remove MII extension cruft 2008-12-12 21:57:57 -08:00
mac.h sfc: Add support for sub-10G speeds 2008-12-12 21:58:17 -08:00
mdio_10g.c sfc: Fix reporting of PHY id 2009-03-02 03:15:04 -08:00
mdio_10g.h sfc: Fix reporting of PHY id 2009-03-02 03:15:04 -08:00
mtd.c drivers/net/sfc: fix sparse warnings: Should it be static? 2009-02-18 17:49:50 -08:00
net_driver.h sfc: Implement adaptive IRQ moderation 2009-03-21 19:06:58 -07:00
phy.h sfc: Add support for QT2025C PHY 2009-03-02 03:15:04 -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 sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation 2009-03-02 03:15:03 -08:00
spi.h sfc: Clean up waits for flash/EEPROM operations 2008-12-12 21:57:35 -08:00
tenxpress.c sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation 2009-03-02 03:15:03 -08:00
tx.c sfc: Pad packets to 33 bytes to prevent TX packet parser lockup 2009-03-21 19:06:55 -07:00
tx.h sfc: Remove some unreachable error paths 2008-09-03 09:53:48 -04:00
workarounds.h sfc: Pad packets to 33 bytes to prevent TX packet parser lockup 2009-03-21 19:06:55 -07:00
xenpack.h
xfp_phy.c sfc: Add support for QT2025C PHY 2009-03-02 03:15:04 -08:00