From: Olof Johansson Date: Tue, 27 Mar 2012 23:00:49 +0000 (-0700) Subject: Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2 * 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux: ARM: pxa: use common IOMEM definition ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol --- 83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4