Merge branch 'from-linus' into upstream

diff --combined MAINTAINERS
index dbcf1d2727697f2ccc515af8ada1b27f939a9ffc,3bab239e82fe5f50427ee59eba95bd6dfe9346c2..8eeaaea838fea2d87b15d02f68743754159815a7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -889,6 -889,12 +889,12 @@@ M:       rdunlap@xenotime.ne
  T:    git http://tali.admingilde.org/git/linux-docbook.git
  S:    Maintained
  
+ DOCKING STATION DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    linux-acpi@vger.kernel.org
+ S:    Maintained
+ 
  DOUBLETALK DRIVER
  P:    James R. Van Zandt
  M:    jrv@vanzandt.mv.com
@@@ -2610,18 -2616,6 +2616,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
@@@ -3346,15 -3340,6 +3352,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