Merge branch 'master'; commit 'v2.6.38-rc7' into next