Merge branch 'core/percpu' into stackprotector
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 17:37:14 +0000 (18:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 17:37:14 +0000 (18:37 +0100)
commitb2b062b8163391c42b3219d466ca1ac9742b9c7b
treef3f920c09b8de694b1bc1d4b878cfd2b0b98c913
parenta9de18eb761f7c1c860964b2e5addc1a35c7e861
parent99937d6455cea95405ac681c86a857d0fcd530bd
Merge branch 'core/percpu' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
13 files changed:
arch/x86/Kconfig
arch/x86/include/asm/pda.h
arch/x86/include/asm/stackprotector.h
arch/x86/include/asm/system.h
arch/x86/kernel/process_64.c
arch/x86/mm/fault.c
include/linux/magic.h
include/linux/sched.h
init/main.c
kernel/exit.c
kernel/fork.c
kernel/panic.c
kernel/sched.c