Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>