Merge branch 'x86/amd-nb' into x86/apic-cleanups