]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9de18e 99937d6)
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
treef3f920c09b8de694b1bc1d4b878cfd2b0b98c913tree | snapshot
parenta9de18eb761f7c1c860964b2e5addc1a35c7e861commit | diff
parent99937d6455cea95405ac681c86a857d0fcd530bdcommit | diff
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 diff1 | diff2 | blob | history
arch/x86/include/asm/pda.h diff1 | diff2 | blob | history
arch/x86/include/asm/stackprotector.h diff1 | | blob | history
arch/x86/include/asm/system.h diff1 | diff2 | blob | history
arch/x86/kernel/process_64.c diff1 | diff2 | blob | history
arch/x86/mm/fault.c diff1 | diff2 | blob | history
include/linux/magic.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/exit.c diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/panic.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.