Merge branch 'x86/amd-avic' into x86/amd