Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts

Conflicts:
	kernel/sched/fair.c

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

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

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