Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D