Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core