Merge branch 'linus' into stackprotector
Ingo Molnar [Wed, 25 Jun 2008 10:27:29 +0000 (12:27 +0200)]
1  2 
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
arch/x86/kernel/process_64.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/sched.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge