Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000 (09:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000 (09:34 +0100)
commite9c4ffb11f0b19005b5b9dc8481687a3637e5887
tree7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63
parent4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6
parent071a0bc2ceace31266836801510879407a3701fa
Merge branch 'linus' into perfcounters/core

Conflicts:
arch/x86/kernel/acpi/boot.c
15 files changed:
arch/x86/Kconfig
arch/x86/Kconfig.cpu
arch/x86/include/asm/paravirt.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
include/linux/init_task.h
include/linux/sched.h
include/linux/syscalls.h
kernel/exit.c
kernel/fork.c
kernel/sched.c