Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2013 19:41:54 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2013 19:41:54 +0000 (12:41 -0700)
commit8b70a90cabafb6a6e1a0d3f838b38355fe48337e
tree1234fd99081958a6d8ca1a8d8bfad7662106749c
parent7644a448ccf200d95ad4426e84a486dec5cc1703
parent5b91a98c61abe914e6a80d7dc15e435c47ea0004
Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull ARM DMA mapping updates from Marek Szyprowski:
 "This contains important bugfixes and an update for IOMMU integration
  support for ARM architecture"

* 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma: Drop __GFP_COMP for iommu dma memory allocations
  ARM: DMA-mapping: mark all !DMA_TO_DEVICE pages in unmapping as clean
  ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
  ARM: dma-mapping: convert DMA direction into IOMMU protection attributes
  ARM: dma-mapping: Get pages if the cpu_addr is out of atomic_pool
arch/arm/mm/dma-mapping.c