Merge commit 'v2.6.39-rc6' into x86/cleanups