From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Jul 2009 21:03:59 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Tag: v2.6.31-rc3~75
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=085ff82c9c615d502d1e6754879d8d4ff590d143;p=linux.git

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Don't use identity mapping for PCI devices behind bridges
  intel-iommu: Use iommu_should_identity_map() at startup time too.
  intel-iommu: No mapping for non-PCI devices
  intel-iommu: Restore DMAR_BROKEN_GFX_WA option for broken graphics drivers
  intel-iommu: Add iommu_should_identity_map() function
  intel-iommu: Fix reattaching of devices to identity mapping domain
  intel-iommu: Don't set identity mapping for bypassed graphics devices
  intel-iommu: Fix dma vs. mm page confusion with aligned_nrpages()
---

085ff82c9c615d502d1e6754879d8d4ff590d143