netfilter: nf_ct_expect: partially implement ctnetlink_change_expect

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f1b5694340f4ff655c774db5c66116ed3a1bb3b3..887c965c2711c5bb5caacf16bbbe42c843e1da33 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2322,9 +2322,9 @@ S:        Supported
 F:     drivers/acpi/dock.c
 
 DOCUMENTATION
-M:     Randy Dunlap <rdunlap@xenotime.net>
+M:     Rob Landley <rob@landley.net>
 L:     [email protected]
-T:     quilt http://xenotime.net/kernel-doc-patches/current/
+T:     TBD
 S:     Maintained
 F:     Documentation/
 
@@ -3587,6 +3587,7 @@ S:        Supported
 F:     drivers/net/wireless/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
+M:     Johannes Berg <[email protected]>
 M:     Wey-Yi Guy <[email protected]>
 M:     Intel Linux Wireless <[email protected]>
 L:     [email protected]
@@ -5886,11 +5887,11 @@ F:      Documentation/scsi/st.txt
 F:     drivers/scsi/st*
 
 SCTP PROTOCOL
-M:     Vlad Yasevich <vladislav.yasevich@hp.com>
+M:     Vlad Yasevich <vyasevich@gmail.com>
 M:     Sridhar Samudrala <[email protected]>
 L:     [email protected]
 W:     http://lksctp.sourceforge.net
-S:     Supported
+S:     Maintained
 F:     Documentation/networking/sctp.txt
 F:     include/linux/sctp.h
 F:     include/net/sctp/
@@ -6466,6 +6467,7 @@ S:        Odd Fixes
 F:     drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
+M:     Rupesh Gujare <[email protected]>
 M:     Chris Kelly <[email protected]>
 S:     Maintained
 F:     drivers/staging/ozwpan/
@@ -6669,6 +6671,16 @@ L:       [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/twl4030*
 
+TI WILINK WIRELESS DRIVERS
+M:     Luciano Coelho <[email protected]>
+L:     [email protected]
+W:     http://wireless.kernel.org/en/users/Drivers/wl12xx
+W:     http://wireless.kernel.org/en/users/Drivers/wl1251
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
+S:     Maintained
+F:     drivers/net/wireless/ti/
+F:     include/linux/wl12xx.h
+
 TIPC NETWORK LAYER
 M:     Jon Maloy <[email protected]>
 M:     Allan Stephens <[email protected]>
@@ -7425,23 +7437,6 @@ M:       Miloslav Trmac <[email protected]>
 S:     Maintained
 F:     drivers/input/misc/wistron_btns.c
 
-WL1251 WIRELESS DRIVER
-M:     Luciano Coelho <[email protected]>
-L:     [email protected]
-W:     http://wireless.kernel.org/en/users/Drivers/wl1251
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
-S:     Maintained
-F:     drivers/net/wireless/wl1251/*
-
-WL1271 WIRELESS DRIVER
-M:     Luciano Coelho <[email protected]>
-L:     [email protected]
-W:     http://wireless.kernel.org/en/users/Drivers/wl12xx
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
-S:     Maintained
-F:     drivers/net/wireless/wl12xx/
-F:     include/linux/wl12xx.h
-
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:     Arnaldo Carvalho de Melo <[email protected]>
 L:     [email protected]