From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:37:51 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Tag: v2.6.35-rc4~64
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=e6d133618836f317f5a2be657f768e56552b9419;p=net-next-2.6.git

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

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Force-disable IOMMU for iGFX on broken Cantiga revisions.
  intel-iommu: Fix double lock in get_domain_for_dev()
  intel-iommu: Fix reference by physical address in intel_iommu_attach_device()
---

e6d133618836f317f5a2be657f768e56552b9419