Merge branch 'linus' into sched/core
Ingo Molnar [Wed, 21 Jul 2010 19:45:02 +0000 (21:45 +0200)]
Merge reason: Move from the -rc3 to the almost-rc6 base.

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

1  2 
arch/powerpc/kernel/process.c
include/linux/sched.h
kernel/sched.c
kernel/sched_fair.c
kernel/time/tick-sched.c

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