Merge branch 'x86/detect-hyper'