| commit | ca1ee219c070eab755712d50638bbcd1f8630fc1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 3 Apr 2009 17:36:57 +0000 (3 10:36 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 3 Apr 2009 17:36:57 +0000 (3 10:36 -0700) | ||
| tree | c0c252a9095830aadc5dc9ffdd16d9167dd605c9 | treesnapshot (tar.gz zip) |
| parent | 3cc50ac0dbda5100684e570247782330155d35e0 | commitdiff |
| parent | afeeb7cebbd223ffee303fd8de4ba97458b13581 | commitdiff |
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
* 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