Merge branch 'linus' into sched/core

Merge reason: update from -rc5 to -almost-final

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_fair.c
Simple merge