Merge branch 'linus' into sched/core

Merge reason: Move from the -rc3 to the almost-rc6 base.

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

diff --cc arch/powerpc/kernel/process.c
Simple merge

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

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_fair.c
Simple merge

diff --cc kernel/time/tick-sched.c
Simple merge