Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 16:39:52 +0000 (17:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 16:39:52 +0000 (17:39 +0100)
commit0936912274af78a21fd8d54c3f94a50a285cf7f9
treeb8082ba0fbd37c4283c0065266376539de399b14
parent87c6fe26186d734e932426cc8ab9fd8cf9aeed94
parent9e9197370dafa7ebc7191d835f0403b13855ca35
parent40bcc69b399ddbcd2d5c52b277a1b27398339b27
Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent
arch/x86/kernel/apic.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/smpboot.c