Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
  x86/PCI: make 32 bit NUMA node array int, not unsigned char
  x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
  MAINTAINTERS: remove hotplug driver entries
  PCI: pciehp: remove slot capabilities definitions
  PCI: pciehp: remove error message definitions
  PCI: pciehp: remove number field
  PCI: pciehp: remove hpc_ops
  PCI: pciehp: remove pci_dev field
  PCI: pciehp: remove crit_sect mutex
  PCI: pciehp: remove slot_bus field
  PCI: pciehp: remove first_slot field
  PCI: pciehp: remove slot_device_offset field
  PCI: pciehp: remove hp_slot field
  PCI: pciehp: remove device field
  PCI: pciehp: remove bus field
  PCI: pciehp: remove slot_num_inc field
  PCI: pciehp: remove num_slots field
  PCI: pciehp: remove slot_list field
  PCI: fix VGA arbiter header file
  PCI: Disable AER with pci=nomsi
  ...

Fixed up trivial conflicts in MAINTAINERS

1 files changed, 3 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0c138ba86526..e797c4d48cf1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -257,12 +257,6 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:      Supported
 F:      drivers/acpi/fan.c
 
-ACPI PCI HOTPLUG DRIVER
-M:      Kristen Carlson Accardi <kristen.c.accardi@intel.com>
-L:      linux-pci@vger.kernel.org
-S:      Supported
-F:      drivers/pci/hotplug/acpi*
-
 ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -4005,11 +3999,11 @@ F:	Documentation/PCI/
 F:      drivers/pci/
 F:      include/linux/pci*
 
-PCIE HOTPLUG DRIVER
-M:      Kristen Carlson Accardi <kristen.c.accardi@intel.com>
+PCI HOTPLUG
+M:      Jesse Barnes <jbarnes@virtuousgeek.org>
 L:      linux-pci@vger.kernel.org
 S:      Supported
-F:      drivers/pci/pcie/
+F:      drivers/pci/hotplug
 
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
@@ -4672,12 +4666,6 @@ F:	drivers/serial/serial_lh7a40x.c
 F:      drivers/usb/gadget/lh7a40*
 F:      drivers/usb/host/ohci-lh7a40*
 
-SHPC HOTPLUG DRIVER
-M:      Kristen Carlson Accardi <kristen.c.accardi@intel.com>
-L:      linux-pci@vger.kernel.org
-S:      Supported
-F:      drivers/pci/hotplug/shpchp*
-
 SIMPLE FIRMWARE INTERFACE (SFI)
 P:      Len Brown
 M:      lenb@kernel.org
@@ -4689,7 +4677,6 @@ F:	arch/x86/kernel/*sfi*
 F:      drivers/sfi/
 F:      include/linux/sfi*.h
 
-
 SIMTEC EB110ATX (Chalice CATS)
 P:      Ben Dooks
 M:      Vincent Sanders <support@simtec.co.uk>