linux-imx

Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on

So we want to change a locking API, but the scheduler uses it, and a conflict
is generated by a recent scheduler fix.

Pick up the pending scheduler fixes to make life easier.

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