Merge branch 'linus' into sched/core
Ingo Molnar [Tue, 4 Oct 2011 09:08:16 +0000 (11:08 +0200)]
Merge reason: pick up the latest fixes.

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

1  2 
include/linux/sched.h
kernel/sched.c
kernel/sched_rt.c

Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge