Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new...

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

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

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