Merge commit 'v2.6.27-rc6' into x86/pat