Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux...
Ingo Molnar [Tue, 20 Dec 2011 11:14:26 +0000 (12:14 +0100)]
1  2 
arch/arm/kernel/setup.c
arch/s390/kernel/setup.c
arch/x86/Kconfig
arch/x86/kernel/mpparse.c
arch/x86/xen/setup.c
drivers/iommu/intel-iommu.c
include/linux/mm.h
kernel/printk.c
mm/page_alloc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge