Merge branch 'sched/locking' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 18 Apr 2011 12:53:18 +0000 (14:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 18 Apr 2011 12:53:33 +0000 (14:53 +0200)
commit6ddafdaab3f809b110ada253d2f2d4910ebd3ac5
tree366bb7513511a05b6e11ab89bfe3b2dbd1d62a03
parent3905c54f2bd2c6f937f87307987ca072eabc3e7b
parentbd8e7dded88a3e1c085c333f19ff31387616f71a
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>
include/linux/sched.h
kernel/sched.c
kernel/sched_fair.c