Merge branch 'x86/mm'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/x86/boot.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/boot/compressed/head_64.S
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge