Merge branch 'akpm' (Andrew's patch-bomb)
[~shefty/rdma-dev.git] / MAINTAINERS
index 6995469965590f0e576514a277b74666368b1080..f47091abb8f7eb4f7eaa84407f91b361126b054e 100644 (file)
@@ -504,7 +504,7 @@ F:  arch/x86/include/asm/geode.h
 AMD IOMMU (AMD-VI)
 M:     Joerg Roedel <joerg.roedel@amd.com>
 L:     iommu@lists.linux-foundation.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 S:     Supported
 F:     drivers/iommu/amd_iommu*.[ch]
 F:     include/linux/amd-iommu.h
@@ -5124,7 +5124,7 @@ F:        Documentation/PCI/pci-error-recovery.txt
 F:     Documentation/powerpc/eeh-pci-error-recovery.txt
 
 PCI SUBSYSTEM
-M:     Jesse Barnes <jbarnes@virtuousgeek.org>
+M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-pci/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
@@ -5134,7 +5134,7 @@ F:        drivers/pci/
 F:     include/linux/pci*
 
 PCI HOTPLUG
-M:     Jesse Barnes <jbarnes@virtuousgeek.org>
+M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     drivers/pci/hotplug