Merge branch 'linus' into sched/core
Ingo Molnar [Thu, 21 Jul 2011 15:59:54 +0000 (17:59 +0200)]
Merge reason: pick up the latest scheduler fixes.

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

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

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