Merge commit 'v2.6.31-rc6' into core/rcu

Merge reason: the branch was on pre-rc1 .30, update to latest.

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/sched.c
Simple merge