commit f3a3404162774770ded2ba1494a4c8ba27cd553e
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 30 10:41:26 2015 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 30 10:41:26 2015 -0800
tree af4771cc86d5a0324c5c9b55f05822c8c977c0cf
parent c6591c8131984457626b29ec04b98132995885b9
parent 35577079b9943e158c7032afe1dde6faf4385222

Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/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