1 files changed, 26 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 277877a34ef6..f56c7e172cee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -384,7 +384,7 @@ S:	Supported
 
 APPLETALK NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -656,6 +656,7 @@ S:	Supported
 ATMEL WIRELESS DRIVER
 P:      Simon Kelley
 M:      simon@thekelleys.org.uk
+L:      linux-wireless@vger.kernel.org
 W:      http://www.thekelleys.org.uk/atmel
 W:      http://atmelwlandriver.sourceforge.net/
 S:      Maintained
@@ -711,6 +712,7 @@ P:	Larry Finger
 M:      Larry.Finger@lwfinger.net
 P:      Stefano Brivio
 M:      st3@riseup.net
+L:      linux-wireless@vger.kernel.org
 W:      http://bcm43xx.berlios.de/
 S:      Maintained
 
@@ -892,6 +894,12 @@ M:	maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+CFG80211 and NL80211
+P:      Johannes Berg
+M:      johannes@sipsolutions.net
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:      Steve French
 M:      sfrench@samba.org
@@ -1034,9 +1042,8 @@ S:	Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
-L:      cycsyn-devel@bazar.conectiva.com.br
+M:      acme@ghostprotocols.net
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 CYCLADES ASYNC MUX DRIVER
@@ -1077,7 +1084,7 @@ S:	Maintained
 
 DCCP PROTOCOL
 P:      Arnaldo Carvalho de Melo
-M:      acme@mandriva.com
+M:      acme@ghostprotocols.net
 L:      dccp@vger.kernel.org
 W:      http://linux-net.osdl.org/index.php/DCCP
 S:      Maintained
@@ -1558,6 +1565,7 @@ S:	Supported
 HOST AP DRIVER
 P:      Jouni Malinen
 M:      jkmaline@cc.hut.fi
+L:      linux-wireless@vger.kernel.org
 L:      hostap@shmoo.com
 W:      http://hostap.epitest.fi/
 S:      Maintained
@@ -1830,6 +1838,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2100.sourceforge.net
@@ -1840,6 +1849,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
@@ -1871,7 +1881,7 @@ S:	Supported
 
 IPX NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -2108,7 +2118,7 @@ S:	Supported
 
 LLC (802.2)
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -2532,6 +2542,7 @@ P:	Pavel Roskin
 M:      proski@gnu.org
 P:      David Gibson
 M:      hermes@gibson.dropbear.id.au
+L:      linux-wireless@vger.kernel.org
 L:      orinoco-users@lists.sourceforge.net
 L:      orinoco-devel@lists.sourceforge.net
 W:      http://www.nongnu.org/orinoco/
@@ -2711,7 +2722,7 @@ S:	Supported
 PRISM54 WIRELESS DRIVER
 P:      Prism54 Development Team
 M:      developers@islsm.org
-L:      netdev@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
 S:      Maintained
 
@@ -2782,7 +2793,7 @@ S:	Maintained
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
 P:      Corey Thomas
 M:      corey@world.std.com
-L:      linux-kernel@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 S:      Maintained
 
 RANDOM NUMBER DRIVER
@@ -3045,7 +3056,7 @@ M:	josejx@gentoo.org
 P:      Daniel Drake
 M:      dsd@gentoo.org
 W:      http://softmac.sipsolutions.net/
-L:      netdev@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 S:      Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
@@ -3750,6 +3761,7 @@ S:	Maintained
 WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
 P:      Jean Tourrilhes
 M:      jt@hpl.hp.com
+L:      linux-wireless@vger.kernel.org
 W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
 S:      Maintained
 
@@ -3766,8 +3778,9 @@ S:	Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
+M:      acme@ghostprotocols.net
+L:      linux-wireless@vger.kernel.org
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 X.25 NETWORK LAYER
@@ -3830,6 +3843,7 @@ M:	dsd@gentoo.org
 P:      Ulrich Kunitz
 M:      kune@deine-taler.de
 W:      http://zd1211.ath.cx/wiki/DriverRewrite
+L:      linux-wireless@vger.kernel.org
 L:      zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:      Maintained