tree f3f920c09b8de694b1bc1d4b878cfd2b0b98c913
parent a9de18eb761f7c1c860964b2e5addc1a35c7e861
parent 99937d6455cea95405ac681c86a857d0fcd530bd
author Ingo Molnar <mingo@elte.hu> 1232300234 +0100
committer Ingo Molnar <mingo@elte.hu> 1232300234 +0100

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>