From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2009 17:36:57 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Tag: v2.6.30-rc1~228
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca1ee219c070eab755712d50638bbcd1f8630fc1;p=pandora-kernel.git

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

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix address wrap on 32-bit kernel.
  intel-iommu: Enable DMAR on 32-bit kernel.
  intel-iommu: fix PCI device detach from virtual machine
  intel-iommu: VT-d page table to support snooping control bit
  iommu: Add domain_has_cap iommu_ops
  intel-iommu: Snooping control support

Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c
---

ca1ee219c070eab755712d50638bbcd1f8630fc1
Reading git-diff-tree failed