From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jun 2012 16:47:57 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.10.0-12.13~21283
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9e68447f5b38d6092a6feeeb713a6564e963e68b;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two patches are in here which fix AMD IOMMU specific issues.  One
  patch fixes a long-standing warning on resume because the
  amd_iommu_resume function enabled interrupts.  The other patch fixes a
  deadlock in an error-path of the page-fault request handling code of
  the IOMMU driver.

* tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix deadlock in ppr-handling error path
  iommu/amd: Cache pdev pointer to root-bridge
---

9e68447f5b38d6092a6feeeb713a6564e963e68b