Merge branch 'linus' into sched/urgent, to pick up dependencies

Signed-off-by: Ingo Molnar <[email protected]>

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

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