]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48ebc92 c6e946c)
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)
commitadbcb2ef1797735f8ec3db063e096b7f7df008b8
treec0c252a9095830aadc5dc9ffdd16d9167dd605c9tree | snapshot
parent48ebc923a31e56b743b0a765b3310d30a745f5fecommit | diff
parentc6e946ca6ee4689e561e87900126923e4988cbdecommit | 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
Linux Kernel Source Tree.