Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux...

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

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

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge