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

..

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

…

ethtool.c

sfc: Implement adaptive IRQ moderation

2009-03-21 19:06:58 -07:00

ethtool.h

…

falcon_gmac.c

…

falcon_hwdefs.h

…

falcon_io.h

sfc: Optimise falcon_writel_page_locked() for page > 0

2009-03-21 19:06:56 -07:00

falcon_xmac.c

…

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

gmii.h

…

Kconfig

…

mac.h

…

Makefile

…

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

…

rx.h

…

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

…

sfe4001.c

sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation

2009-03-02 03:15:03 -08:00

spi.h

…

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

…

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