Ingo Molnar 0d5959723e Merge branch 'linus' into x86/mce3 ... Conflicts: arch/x86/kernel/cpu/mcheck/mce_64.c arch/x86/kernel/irq.c Merge reason: Resolve the conflicts above. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-11 23:31:52 +02:00
..
apic_flat_64.c	x86: don't call read_apic_id if !cpu_has_apic	2009-05-18 08:43:25 +02:00
apic.c	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
bigsmp_32.c
es7000_32.c	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
io_apic.c	irq/cpumask: make memoryless node zero happy	2009-06-11 19:27:08 +03:00
ipi.c
Makefile
nmi.c	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
numaq_32.c
probe_32.c	x86: clean up declarations and variables	2009-04-12 15:20:16 +02:00
probe_64.c	x86: x2apic, IR: Clean up X86_X2APIC and INTR_REMAP config checks	2009-04-21 09:08:25 +02:00
summit_32.c	x86: apic: Remove duplicated macros	2009-04-27 09:13:36 +02:00
x2apic_cluster.c	x86: apic/x2apic_cluster.c x86_cpu_to_logical_apicid should be static	2009-04-12 12:39:24 +02:00
x2apic_phys.c
x2apic_uv_x.c	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:15:14 -07:00