Merge branch 'x86/urgent' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
commit92e2d508464b6293ad274fb606f766a458894142
tree39bf383364530e5cdeacb205d32d69a4b78e253d
parent5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1
parentd315760ffa261c15ff92699ac6f514112543d7ca
Merge branch 'x86/urgent' into core/percpu

Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/Kconfig
arch/x86/Kconfig.cpu
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/processor.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/process_64.c
arch/x86/kernel/setup.c
arch/x86/kernel/traps.c
arch/x86/kernel/vmi_32.c