tree 6d7cdb70158ffd2be9b5165074c74c3333bc6210
parent b83aea88d3ab24a427351b496e64f0725ab09bc3
parent c9b24996d5da1bf7d2bebab5770dfcc7834c53b7
author Linus Torvalds <torvalds@linux-foundation.org> 1381882414 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1381882414 -0700

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

Pull DMA-mapping fix from Marek Szyprowski:
 "A bugfix for the IOMMU-based implementation of dma-mapping subsystem
  for ARM architecture"

* 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Always pass proper prot flags to iommu_map()