Merge tag 'v3.5-rc6' into x86/mce