Merge commit 'v2.6.28' into core/core

diff --cc kernel/posix-cpu-timers.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softlockup.c
Simple merge