Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 1 Mar 2012 09:26:41 +0000 (10:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 1 Mar 2012 09:26:43 +0000 (10:26 +0100)
commit7e4d960993331e92567f0180e45322a93e6780ba
tree4d7444035303fc0b545e88afbd894176344fb2a3
parentde5bdff7a72acc281219be2b8edeeca1fd81c542
parent164974a8f2a482f1abcb027c6d1a89dd79b14297
Merge branch 'linus' into sched/core

Merge reason: we'll queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
block/blk.h
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c