Merge branch 'sched/locking' into sched/core

Merge reason: the rq locking changes are stable,
              propagate them into the .40 queue.

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

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

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_fair.c
Simple merge