From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Oct 2013 00:13:34 +0000 (-0700)
Subject: Merge branch 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba0a062ef55a6f8e8361a63ee48e654879ba00bf;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

ba0a062ef55a6f8e8361a63ee48e654879ba00bf