ath9k: Trivial fix in Kconfig

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 381190c..df55d24 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -150,7 +150,7 @@ F:  drivers/scsi/53c700*
 
 6PACK NETWORK DRIVER FOR AX.25
 P:     Andreas Koensgen
-M:     ajk@iehk.rwth-aachen.de
+M:     ajk@comnets.uni-bremen.de
 L:     linux-hams@vger.kernel.org
 S:     Maintained
 F:     drivers/net/hamradio/6pack.c
@@ -1612,6 +1612,13 @@ S:       Supported
 F:     fs/configfs/
 F:     include/linux/configfs.h
 
+CONNECTOR
+P:     Evgeniy Polyakov
+M:     zbr@ioremap.net
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/connector/
+
 CONTROL GROUPS (CGROUPS)
 P:     Paul Menage
 M:     menage@google.com
@@ -4089,6 +4096,7 @@ L:        netfilter@vger.kernel.org
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
+T:     git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
 S:     Supported
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
@@ -4976,7 +4984,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/rtl818*
+F:     drivers/net/wireless/rtl818x/rtl8180*
 
 RTL8187 WIRELESS DRIVER
 P:     Herton Ronaldo Krzesinski
@@ -5583,7 +5591,6 @@ S:        Odd Fixes
 F:     drivers/net/starfire*
 
 STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
-W:     http://mosquitonet.Stanford.EDU/strip.html
 S:     Orphan
 F:     drivers/net/wireless/strip.c
 F:     include/linux/if_strip.h
@@ -6459,6 +6466,15 @@ M:       mitr@volny.cz
 S:     Maintained
 F:     drivers/input/misc/wistron_btns.c
 
+WL1251 WIRELESS DRIVER
+P:     Kalle Valo
+M:     kalle.valo@nokia.com
+L:     linux-wireless@vger.kernel.org
+W:     http://wireless.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:     Maintained
+F:     drivers/net/wireless/wl12xx/wl1251*
+
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:     Arnaldo Carvalho de Melo
 M:     acme@ghostprotocols.net