]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3cc50ac afeeb7c)
Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 17:36:57 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 17:36:57 +0000 (10:36 -0700)
commitca1ee219c070eab755712d50638bbcd1f8630fc1
treec0c252a9095830aadc5dc9ffdd16d9167dd605c9tree | snapshot
parent3cc50ac0dbda5100684e570247782330155d35e0commit | diff
parentafeeb7cebbd223ffee303fd8de4ba97458b13581commit | diff
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
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/amd_iommu.c diff1 | diff2 | blob | history
drivers/base/iommu.c diff1 | diff2 | blob | history
drivers/pci/intel-iommu.c diff1 | diff2 | blob | history
include/linux/intel-iommu.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.