From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2012 00:05:21 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.7-rc3~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=735f0a985ac414b6e5f09cf6199b6fd5e118ff62;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'iommu-fixes-v3.7-rc2' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two fixes this time:

   1. Another fix for a broken BIOS to detect when AMD IOMMU interrupt
      remapping can not work reliably
   2. Typo fix for NVidia IOMMU driver"

* tag 'iommu-fixes-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/tegra: smmu: Fix deadly typo
  iommu/amd: Work around wrong IOAPIC device-id in IVRS table
---

735f0a985ac414b6e5f09cf6199b6fd5e118ff62