From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jan 2015 18:41:26 +0000 (-0800)
Subject: Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~2445
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f3a3404162774770ded2ba1494a4c8ba27cd553e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'iommu-fixes-v3.19-rc6' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two small fixes for the Tegra GART IOMMU driver:

   - provide a .map_sg function for iommu_ops
   - do not register Tegra GART driver as a workaround because of issues
     with it when used from DRM code"

* tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/tegra: gart: Provide default ->map_sg() callback
  iommu/tegra: gart: Do not register with bus
---

f3a3404162774770ded2ba1494a4c8ba27cd553e