Merge commit 'v2.6.39-rc4' into sched/core

Merge reason: Pick up upstream fixes.

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

diff --cc arch/blackfin/mach-common/smp.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge