summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-24 07:08:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-24 07:08:24 +0200
commit6a0596583fadd15dca293736114abdea306d3d7c (patch)
tree39ce634c2f9578c548f990215579559ba4dc630d /MAINTAINERS
parent15cc91011246fa67f755eb3feea08d57a7692fde (diff)
parent4399c8bf2b9093696fa8160d79712e7346989c46 (diff)
downloadlwn-6a0596583fadd15dca293736114abdea306d3d7c.tar.gz
lwn-6a0596583fadd15dca293736114abdea306d3d7c.zip
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6: intel-iommu: fix superpage support in pfn_to_dma_pte() intel-iommu: set iommu_superpage on VM domains to lowest common denominator intel-iommu: fix return value of iommu_unmap() API MAINTAINERS: Update VT-d entry for drivers/pci -> drivers/iommu move intel-iommu: Export a flag indicating that the IOMMU is used for iGFX. intel-iommu: Workaround IOTLB hang on Ironlake GPU intel-iommu: Fix AB-BA lockdep report
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b3bc88d9c03a..6185d0513584 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3313,7 +3313,7 @@ M: David Woodhouse <dwmw2@infradead.org>
L: iommu@lists.linux-foundation.org
T: git git://git.infradead.org/iommu-2.6.git
S: Supported
-F: drivers/pci/intel-iommu.c
+F: drivers/iommu/intel-iommu.c
F: include/linux/intel-iommu.h
INTEL IOP-ADMA DMA DRIVER