From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jul 2013 19:41:54 +0000 (-0700)
Subject: Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: upstream/snapshot3+hdmi~4767
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b70a90cabafb6a6e1a0d3f838b38355fe48337e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

8b70a90cabafb6a6e1a0d3f838b38355fe48337e