Merge branch 'linus' into stackprotector

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge