Merge commit 'v2.6.39-rc4' into sched/core
Ingo Molnar [Thu, 21 Apr 2011 09:39:21 +0000 (11:39 +0200)]
Merge reason: Pick up upstream fixes.

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

1  2 
arch/blackfin/mach-common/smp.c
include/linux/sched.h
kernel/sched.c

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