/spare/repo/netdev-2.6 branch 'ieee80211'

diff --combined MAINTAINERS
index 473a08a9cc3ddcabc6769d3586021514747ea3e3,564a03e61a0c4b2322136ab9d96b3f121391ee83..ed3a50ee30cefab57419ad24c6fd2187d175efd7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -991,13 -991,6 +991,13 @@@ M:       mike.miller@hp.co
  L:    iss_storagedev@hp.com
  S:    Supported
   
 +HOST AP DRIVER
 +P:    Jouni Malinen
 +M:    jkmaline@cc.hut.fi
 +L:    hostap@shmoo.com
 +W:    http://hostap.epitest.fi/
 +S:    Maintained
 +
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
  P:    Jaroslav Kysela
  M:    perex@suse.cz
@@@ -1746,7 -1739,7 +1746,7 @@@ S:      Maintaine
  
  OPL3-SA2, SA3, and SAx DRIVER
  P:    Zwane Mwaikambo
- M:    zwane@commfireservices.com
+ M:    zwane@arm.linux.org.uk
  L:    linux-sound@vger.kernel.org
  S:    Maintained
  
@@@ -1832,6 -1825,12 +1832,12 @@@ P:    Greg Kroah-Hartma
  M:    greg@kroah.com
  S:    Maintained
  
+ PCIE HOTPLUG DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    pcihpd-discuss@lists.sourceforge.net
+ S:    Maintained
+ 
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
@@@ -1996,7 -1995,7 +2002,7 @@@ S:      Maintaine
  
  SC1200 WDT DRIVER
  P:    Zwane Mwaikambo
- M:    zwane@commfireservices.com
+ M:    zwane@arm.linux.org.uk
  S:    Maintained
  
  SCHEDULER
@@@ -2208,6 -2207,12 +2214,12 @@@ W:    http://projects.buici.com/ar
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
+ SHPC HOTPLUG DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    pcihpd-discuss@lists.sourceforge.net
+ S:    Maintained
+ 
  SPARC (sparc32):
  P:    William L. Irwin
  M:    wli@holomorphy.com

diff --combined drivers/net/wireless/Kconfig
index ff5b1b1de2fa2400cc0493dc4d3aa4b9ea4312f9,0574050672261c360b3920b3d1bd2d42bb1aff3a..5d814dfc8bc09796fbdd66892bf2c06929b94946
--- 1/drivers/net/wireless/Kconfig
--- 2/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@@ -374,7 -374,7 +374,7 @@@ config PCMCIA_HERME
  
  config AIRO_CS
        tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
-       depends on NET_RADIO && PCMCIA
+       depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
        ---help---
          This is the standard Linux driver to support Cisco/Aironet PCMCIA
          802.11 wireless cards.  This driver is the same as the Aironet
@@@ -459,8 -459,6 +459,8 @@@ config PRISM5
          say M here and read <file:Documentation/modules.txt>.  The module
          will be called prism54.ko.
  
 +source "drivers/net/wireless/hostap/Kconfig"
 +
  # yes, this works even when no drivers are selected
  config NET_WIRELESS
        bool