]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdd9c300bedb34f8089939c48f1ee13004c36209a
tree39bf383364530e5cdeacb205d32d69a4b78e253d
parentbe2cbc87175d5c82c5a236296cf43e80cb5781cf
parent5995ae8906163c9e88af1348670cdce7da040e26
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