Merge commit 'v2.6.31-rc8' into x86/txt