From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Mar 2015 00:36:19 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~2175
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9c3e1323ecb382ef8731c7e7dc0891e4e00f9607;p=firefly-linux-kernel-4.4.55.git

Merge tag 'iommu-fixes-v4.0-rc3' of git://git./linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:
 "The patches contain:

   - fix multiple ARM IOMMU drivers to behave well when the hardware is
     not present

   - mark MSM driver as broken

   - fix build errors with the new ARM generic io-page-table code"

* tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/io-pgtable-arm: Add built time dependency
  iommu/msm: Mark driver BROKEN
  iommu/rockchip: Play nice in multi-platform builds
  iommu/omap: Play nice in multi-platform builds
  iommu/exynos: Play nice in multi-platform builds
  iommu/io-pgtable-arm: Fix self-test WARNs on i386
---

9c3e1323ecb382ef8731c7e7dc0891e4e00f9607