Merge branch 'linus' into sched/core
Ingo Molnar [Thu, 1 Mar 2012 09:26:41 +0000 (10:26 +0100)]
Merge reason: we'll queue up dependent patches.

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

1  2 
block/blk.h
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c

diff --cc block/blk.h
Simple merge
Simple merge
Simple merge
Simple merge