Merge branch 'sched/cleanups'; commit 'v2.6.29' into sched/core