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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits)
  PCI hotplug: fix logic in Compaq hotplug controller bus speed setup
  PCI: don't export linux/io.h from pci.h
  PCI: PCI_QUIRKS depends on PCI
  PCI hotplug: pciehp: poll data link layer link active
  PCI hotplug: pciehp: fix possible memory leak in pcie_init
  PCI: Workaround invalid P2P bridge bus numbers
  PCI Hotplug: fakephp: add duplicate slot name debugging
  PCI: Hotplug core: remove 'name'
  PCI: shcphp: remove 'name' parameter
  PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
  PCI: rpaphp: kmalloc/kfree slot->name directly
  PCI: pciehp: remove 'name' parameter
  PCI: ibmphp: stop managing hotplug_slot->name
  PCI: fakephp: remove 'name' parameter
  PCI, PCI Hotplug: introduce slot_name helpers
  PCI: cpqphp: stop managing hotplug_slot->name
  PCI: cpci_hotplug: stop managing hotplug_slot->name
  PCI: acpiphp: remove 'name' parameter
  PCI: prevent duplicate slot names
  PCI Hotplug: serialize pci_hp_register and pci_hp_deregister
  ...

diff --combined MAINTAINERS
index cecf1592609ead4a2597c7b3b5ae8d8e9c122372,4b41eb61a04d22626b6d12b58c01fd3d32336b4e..67fa3cff1749812ebc222bdff363369aaeff0c9b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1053,12 -1053,6 +1053,12 @@@ L:    cbe-oss-dev@ozlabs.or
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
 +CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
@@@ -2182,13 -2176,6 +2182,13 @@@ M:    maciej.sosnowski@intel.co
  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
@@@ -2941,9 -2928,9 +2941,9 @@@ S:      Maintaine
  
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  P:    Faisal Latif
 -M:    flatif@neteffect.com
 +M:    faisal.latif@intel.com
  P:    Chien Tung
 -M:    ctung@neteffect.com
 +M:    chien.tin.tung@intel.com
  L:    general@lists.openfabrics.org
  W:    http://www.neteffect.com
  S:    Supported
@@@ -3257,11 -3244,6 +3257,6 @@@ L:     linux-pci@vger.kernel.or
  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
@@@ -4204,12 -4186,6 +4199,12 @@@ L:    sparclinux@vger.kernel.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  S:    Maintained
  
 +ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  UNIFORM CDROM DRIVER
  P:    Jens Axboe
  M:    axboe@kernel.dk
@@@ -4635,11 -4611,6 +4630,11 @@@ M:    zaga@fly.cc.fer.h
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +S:    Maintained
 +
  WISTRON LAPTOP BUTTON DRIVER
  P:    Miloslav Trmac
  M:    mitr@volny.cz