]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit735459a07c5ae10bb6f08e760c9a075ef47e73fe
treef3f920c09b8de694b1bc1d4b878cfd2b0b98c913
parent9022a53c69d0aa6181edc3fb8e3c71c958bcec37
parentd77676d96fe0e945a7ff9b5e3a222ebb5b1a0d5e
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