Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core