Merge branch 'irq/numa' into x86/mce3
authorH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 22:13:02 +0000 (15:13 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 22:25:31 +0000 (15:25 -0700)
commit48b1fddbb100a64f3983ca9768b8ea629a09aa20
tree7cf552c623cb0aa0dd945df55b7eaf5a0697e277
parent38736072d45488fd45f076388b6570419bbbc682
parentee4c24a5c9b530481394132c8dbc10572d57c075
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>
arch/x86/Kconfig
arch/x86/include/asm/irq_vectors.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irq.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/traps.c