Ingo Molnar 6c869e772c Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-11-26 15:07:02 +01:00
..
apic_flat_64.c	arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code	2010-02-04 11:55:47 +01:00
apic_noop.c	x86: Fix bogus warning in apic_noop.apic_write()	2009-12-07 13:16:37 +01:00
apic.c	x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog	2010-11-18 09:08:23 +01:00
bigsmp_32.c	x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system	2009-12-17 22:03:06 -08:00
es7000_32.c	x86/apic/es7000_32: Remove unused variable	2010-07-08 09:14:37 +02:00
hw_nmi.c	Merge branch 'perf/urgent' into perf/core	2010-11-26 15:07:02 +01:00
io_apic.c	x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog	2010-11-18 09:08:23 +01:00
ipi.c	Merge commit 'v2.6.31-rc7' into x86/cleanups	2009-08-24 12:25:54 +02:00
Makefile	x86, nmi_watchdog: Remove the old nmi_watchdog	2010-11-18 09:08:23 +01:00
numaq_32.c	x86, memblock: Replace e820_/_early string with memblock_	2010-08-27 11:13:47 -07:00
probe_32.c	x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs	2010-02-09 20:51:11 -08:00
probe_64.c	x86, x2apic: Simplify apic init in SMP and UP builds	2010-09-15 17:37:10 -07:00
summit_32.c	x86: apic: Do not use stacked physid_mask_t	2009-11-10 05:52:07 +01:00
x2apic_cluster.c	x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system	2009-12-17 22:03:06 -08:00
x2apic_phys.c	x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system	2009-12-17 22:03:06 -08:00
x2apic_uv_x.c	x86, UV: Update node controller MMRs	2010-11-10 10:06:38 +01:00