linux/arch/x86/kernel/apic
Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic
Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-22 20:05:19 +01:00
..
Makefile x86, apic: separate 32-bit setup functionality out of apic_32.c 2009-02-17 23:12:48 +01:00
apic.c Merge branch 'linus' into x86/apic 2009-02-22 20:05:19 +01:00
apic_flat_64.c
bigsmp_32.c
es7000_32.c
io_apic.c
ipi.c
nmi.c
numaq_32.c
probe_32.c x86, apic: separate 32-bit setup functionality out of apic_32.c 2009-02-17 23:12:48 +01:00
probe_64.c x86: select x2apic ops in early apic probe only if x2apic mode is enabled 2009-02-22 18:20:50 +01:00
summit_32.c
x2apic_cluster.c x86: select x2apic ops in early apic probe only if x2apic mode is enabled 2009-02-22 18:20:50 +01:00
x2apic_phys.c x86: select x2apic ops in early apic probe only if x2apic mode is enabled 2009-02-22 18:20:50 +01:00
x2apic_uv_x.c