From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2014 21:34:25 +0000 (-0700)
Subject: Merge branch 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: v3.15-rc1~120
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7474043eff6f7c20141b2f49f774d0aab6542220;p=linux.git

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

Pull DMA-mapping updates from Marek Szyprowski:
 "This contains extension for more efficient handling of io address
  space for dma-mapping subsystem for ARM architecture"

* 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()
  arm: dma-mapping: Add support to extend DMA IOMMU mappings
---

7474043eff6f7c20141b2f49f774d0aab6542220