Merge branch 'x86/apic-cleanups' into x86/urgent