tree c0c252a9095830aadc5dc9ffdd16d9167dd605c9
parent 3cc50ac0dbda5100684e570247782330155d35e0
parent afeeb7cebbd223ffee303fd8de4ba97458b13581
author Linus Torvalds <torvalds@linux-foundation.org> 1238780217 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238780217 -0700

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