Merge branch 'from-linus' into upstream

diff --combined MAINTAINERS
index de443b92540c6e75eaa11521e0c0b1a5f00fcd10,bac3f706f75e0f19a1b0faebf83ee2372744642d..4af1c6dc96f624e2367634605682ec0e448c74c4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,6 -214,12 +214,12 @@@ W:       http://acpi.sourceforge.net
  T:    git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Maintained
  
+ ACPI PCI HOTPLUG DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    pcihpd-discuss@lists.sourceforge.net
+ S:    Maintained
+ 
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
  M:    Thorsten Knabe <linux@thorsten-knabe.de>
@@@ -2597,18 -2603,6 +2603,18 @@@ P:    Nicolas Pitr
  M:    nico@cam.org
  S:    Maintained
  
 +SOFTMAC LAYER (IEEE 802.11)
 +P:    Johannes Berg
 +M:    johannes@sipsolutions.net
 +P:    Joe Jezak
 +M:    josejx@gentoo.org
 +P:    Daniel Drake
 +M:    dsd@gentoo.org
 +W:    http://softmac.sipsolutions.net/
 +L:    softmac-dev@sipsolutions.net
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  P:    Ingo Molnar
  M:    mingo@redhat.com
@@@ -3317,15 -3311,6 +3323,15 @@@ W:    http://www.qsl.net/dl1bke
  L:    linux-hams@vger.kernel.org
  S:    Maintained
  
 +ZD1211RW WIRELESS DRIVER
 +P:    Daniel Drake
 +M:    dsd@gentoo.org
 +P:    Ulrich Kunitz
 +M:    kune@deine-taler.de
 +W:    http://zd1211.ath.cx/wiki/DriverRewrite
 +L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
 +S:    Maintained
 +
  ZF MACHZ WATCHDOG
  P:    Fernando Fuganti
  M:    fuganti@netbank.com.br