Merge branches 'x86/apic', 'x86/cleanups' and 'x86/mm' into x86/core