Merge branch 'sched/core'

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

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

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