Merge branch 'x86/urgent' into x86/irq
authorH. Peter Anvin <hpa@zytor.com>
Sun, 21 Feb 2010 05:51:42 +0000 (21:51 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 21 Feb 2010 06:54:05 +0000 (22:54 -0800)
commitaef55d4922e62a0d887e60d87319f3718aec6ced
treee81bdf46d49fa3421747b2b2074aaeae3aee890b
parentca4dbc668412d5fe039be3e26e8e717a616d1ca5
parenteb5b3794062824ba12d883901eea49ea89d0a678
Merge branch 'x86/urgent' into x86/irq

Merge reason: conflict 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