]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into stackprotector
authorIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000 (08:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000 (08:31 +0100)
commita9de18eb761f7c1c860964b2e5addc1a35c7e861
tree886e75fdfd09690cd262ca69cb7f5d1d42b48602
parentb2aaf8f74cdc84a9182f6cabf198b7763bcb9d40
parent6a94cb73064c952255336cc57731904174b2c58f
Merge branch 'linus' into stackprotector

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