H. Peter Anvin 48b1fddbb1 Merge branch 'irq/numa' into x86/mce3 ... Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa and modified in x86/mce3; this merge resolves the conflict. Conflicts: arch/x86/kernel/irqinit.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>		2009-06-01 15:25:31 -07:00
..
apic.c	Merge branch 'irq/numa' into x86/mce3	2009-06-01 15:25:31 -07:00
apic_flat_64.c	x86: don't call read_apic_id if !cpu_has_apic	2009-05-18 08:43:25 +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	x86, io-apic: Don't mark pin_programmed early	2009-05-19 14:26:51 +02:00
ipi.c
Makefile
nmi.c	x86, mce: use 64bit machine check code on 32bit	2009-05-28 09:24:13 -07:00
numaq_32.c
probe_32.c
probe_64.c
summit_32.c
x2apic_cluster.c
x2apic_phys.c
x2apic_uv_x.c