Merge commit 'v3.0-rc5' into sched/core
Ingo Molnar [Fri, 1 Jul 2011 08:34:09 +0000 (10:34 +0200)]
Merge reason: Move to a (much) newer base.

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

1  2 
kernel/sched.c
kernel/sched_rt.c

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