Merge commit 'v2.6.38-rc6' into for-2.6.39/core