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