Merge branch 'x86/boot' into x86/mm, to avoid conflict