Merge commit 'v2.6.38-rc8' into x86/asm