Merge commit 'v2.6.38-rc6' into devicetree/next