Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:37:51 +0000 (07:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:37:51 +0000 (07:37 -0700)
commite6d133618836f317f5a2be657f768e56552b9419
treea08f0ef9fbcab6c33c7c85e58a0012e9119d2ff1
parent7f607455c3b91fec267c48a4177526cbb5e501f4
parent2d9e667efdfb4e986074d98e7d9a424003c7c43b
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()