Merge branch 'x86/irq' into x86/apic
authorH. Peter Anvin <hpa@zytor.com>
Tue, 23 Feb 2010 00:20:34 +0000 (16:20 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 23 Feb 2010 00:20:34 +0000 (16:20 -0800)
commitd02e30c31c57683a66ed68a1bcff900ca78f6d56
treec3ce99a00061bcc1199b50fa838147d876c56717
parent0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9
parentaef55d4922e62a0d887e60d87319f3718aec6ced
Merge branch 'x86/irq' into x86/apic

Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/smpboot.c