Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 08:45:15 +0000 (09:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 08:45:15 +0000 (09:45 +0100)
commite1df957670aef74ffd9a4ad93e6d2c90bf6b4845
treebca1fcfef55b3e3e82c9a822b4ac6428fce2b419
parent2b583d8bc8d7105b58d7481a4a0ceb718dac49c6
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge branch 'linus' into perfcounters/core

Conflicts:
fs/exec.c
include/linux/init_task.h

Simple context conflicts.
18 files changed:
arch/x86/Kconfig
arch/x86/include/asm/thread_info.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/common.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/signal.c
drivers/acpi/processor_idle.c
drivers/char/sysrq.c
fs/exec.c
include/linux/init_task.h
include/linux/sched.h
init/Kconfig
kernel/Makefile
kernel/exit.c
kernel/fork.c
kernel/sched.c
kernel/sys.c