Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Sep 2011 12:01:26 +0000 (14:01 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Sep 2011 12:01:39 +0000 (14:01 +0200)
Merge reason: We are queueing up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge