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

diff --cc arch/arm/kernel/smp.c
Simple merge

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

diff --cc init/Kconfig
Simple merge