Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a2afc494de4ce279d78738096ce6cbd9ccc11bf5..67fa3cff1749812ebc222bdff363369aaeff0c9b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2182,6 +2182,13 @@ M:       maciej.sosnowski@intel.com
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 
+INTEL IOMMU (VT-d)
+P:     David Woodhouse
+M:     dwmw2@infradead.org
+L:     iommu@lists.linux-foundation.org
+T:     git://git.infradead.org/iommu-2.6.git
+S:     Supported
+
 INTEL IOP-ADMA DMA DRIVER
 P:     Dan Williams
 M:     dan.j.williams@intel.com
@@ -3250,11 +3257,6 @@ L:       linux-pci@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:     Supported
 
-PCI HOTPLUG CORE
-P:     Kristen Carlson Accardi
-M:     kristen.c.accardi@intel.com
-S:     Supported
-
 PCIE HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com