Merge "ARM: dma-mapping: add support for IOMMU mapper" into msm-3.4