Merge branches 'x86/apic', 'x86/misc' and 'x86/splitlock' into x86/urgent