Merge branch 'linus' into sched/core

Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

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

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

diff --cc kernel/sched.c
Simple merge