From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Feb 2012 03:11:00 +0000 (-0800)
Subject: Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=63082402968f4b73f10b28a8ac1f3da821aeb82d;p=~shefty%2Frdma-dev.git

Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

One patch fixes an bug in the ARM/MSM IOMMU code which returned sucess
in the unmap function even when an error occured and the other patch
adds a workaround into the AMD IOMMU driver to better handle broken IVRS
ACPI tables (this patch fixes the case when a device is not listed in
the table but actually translated by the iommu).

* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/msm: Fix error handling in msm_iommu_unmap()
  iommu/amd: Work around broken IVRS tables
---

63082402968f4b73f10b28a8ac1f3da821aeb82d