Merge commit 'v2.6.26-rc9' into x86/cpu