From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Feb 2013 18:45:25 +0000 (-0800)
Subject: Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: v3.9-rc1~74
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=42a0a1b0fd343888c59afc8b243a77bcec2cc11c;p=~emulex%2Finfiniband.git

Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA-mapping updates from Marek Szyprowski:
 "This time all patches are related only to ARM DMA-mapping subsystem.
  The main extension provided by this pull request is highmem support.
  Besides that it contains a bunch of small bugfixes and cleanups."

* 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation
  ARM: dma-mapping: Add maximum alignment order for dma iommu buffers
  ARM: dma-mapping: use himem for DMA buffers for IOMMU-mapped devices
  ARM: dma-mapping: add support for CMA regions placed in highmem zone
  arm: dma mapping: export arm iommu functions
  ARM: dma-mapping: Add arm_iommu_detach_device()
  ARM: dma-mapping: Add macro to_dma_iommu_mapping()
  ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask()
  ARM: iommu: Include linux/kref.h in asm/dma-iommu.h
---

42a0a1b0fd343888c59afc8b243a77bcec2cc11c