Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (42 commits)
  PCI: Change PCI subsystem MAINTAINER
  PCI: pci-iommu-iotlb-flushing-speedup
  PCI: pci_setup_bridge() mustn't be __devinit
  PCI: pci_bus_size_cardbus() mustn't be __devinit
  PCI: pci_scan_device() mustn't be __devinit
  PCI: pci_alloc_child_bus() mustn't be __devinit
  PCI: replace remaining __FUNCTION__ occurrences
  PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
  PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
  PCI: clean up resource alignment management
  PCI: aerdrv_acpi.c: remove unneeded NULL check
  PCI: Update VIA CX700 quirk
  PCI: Expose PCI VPD through sysfs
  PCI: iommu: iotlb flushing
  PCI: simplify quirk debug output
  PCI: iova RB tree setup tweak
  PCI: parisc: use generic pci_enable_resources()
  PCI: ppc: use generic pci_enable_resources()
  PCI: powerpc: use generic pci_enable_resources()
  PCI: ia64: use generic pci_enable_resources()
  ...

1 files changed, 2 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a46ec689f0a..525d09b4880 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3065,11 +3065,10 @@ L:	linux-pci@atrey.karlin.mff.cuni.cz
 S:      Supported
 
 PCI SUBSYSTEM
-P:      Greg Kroah-Hartman
-M:      gregkh@suse.de
+P:      Jesse Barnes
+M:      jbarnes@virtuousgeek.org
 L:      linux-kernel@vger.kernel.org
 L:      linux-pci@atrey.karlin.mff.cuni.cz
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:      Supported
 
 PCI HOTPLUG CORE