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
cpumask: use new cpumask functions throughout x86
2009-03-13 14:49:54 +10:30
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
cpumask: remove x86 cpumask_t uses.
2009-03-13 14:49:57 +10:30
probe_32.c
cpumask: remove cpumask_t assignment from vector_allocation_domain()
2009-03-13 14:49:56 +10:30
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: add x2apic_wrmsr_fence() to x2apic flush tlb paths
2009-03-18 09:36:14 +01:00
x2apic_phys.c
x86: add x2apic_wrmsr_fence() to x2apic flush tlb paths
2009-03-18 09:36:14 +01:00
x2apic_uv_x.c
Merge commit 'v2.6.30-rc5' into x86/apic
2009-05-11 09:50:02 +02:00