Merge branch 'linus' into stackprotector
authorIngo Molnar <mingo@elte.hu>
Wed, 15 Oct 2008 11:46:29 +0000 (13:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 15 Oct 2008 11:46:29 +0000 (13:46 +0200)
commitb2aaf8f74cdc84a9182f6cabf198b7763bcb9d40
tree53ccb1c2c14751fe69cf93102e76e97021f6df07
parent4f962d4d65923d7b722192e729840cfb79af0a5a
parent278429cff8809958d25415ba0ed32b59866ab1a8
Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
15 files changed:
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/Makefile
arch/x86/kernel/Makefile
arch/x86/kernel/process_64.c
arch/x86/mm/fault.c
include/asm-x86/pda.h
include/asm-x86/system.h
include/linux/magic.h
include/linux/sched.h
init/main.c
kernel/exit.c
kernel/fork.c
kernel/panic.c
kernel/sched.c