Tejun Heo d4bbf7e775 Merge branch 'master' into x86/memblock ... Conflicts & resolutions: * arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve(). * drivers/pci/intel-iommu.c 166e9278a3 "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3 "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file. * mm/Kconfig 6661672053 "memblock: add NO_BOOTMEM config symbol" c378ddd53f "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict. * mm/memblock.c d1f0ece6cd "mm/memblock.c: small function definition fixes" ed7b56a799 "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial. Signed-off-by: Tejun Heo <tj@kernel.org>		2011-11-28 09:46:22 -08:00
..
asm	Merge branch 'master' into x86/memblock	2011-11-28 09:46:22 -08:00