Merge commit 'v2.6.26-rc8' into x86/mce