Merge branch 'linus' into x86/apic
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
commitf8a6b2b9cee298a9663cbe38ce1eb5240987cb62
treeb356490269c9e77d164dcc1477792b882fbb8bdb
parentba1511bf7fbda452138e4096bf10d5a382710f4f
parent071a0bc2ceace31266836801510879407a3701fa
Merge branch 'linus' into x86/apic

Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
18 files changed:
arch/arm/kernel/irq.c
arch/blackfin/kernel/irqchip.c
arch/sparc/kernel/irq_64.c
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/paravirt.h
arch/x86/include/asm/processor.h
arch/x86/include/asm/spinlock.h
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/process.c
arch/x86/kernel/traps.c
arch/x86/kernel/vmi_32.c
arch/x86/mm/fault.c
drivers/misc/Kconfig
include/linux/sched.h
kernel/exit.c
kernel/fork.c
kernel/sched.c