tcp: Repair socket queues

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6750036223d5cc91438073344c8ba5d3c3df16cc..250f59cc9d3cc2484d63d63c015b710de63c0cc7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5202,7 +5202,7 @@ S:        Maintained
 F:     include/linux/personality.h
 
 PHONET PROTOCOL
-M:     Remi Denis-Courmont <remi.denis-courmont@nokia.com>
+M:     Remi Denis-Courmont <courmisch@gmail.com>
 S:     Supported
 F:     Documentation/networking/phonet.txt
 F:     include/linux/phonet.h
@@ -6669,6 +6669,16 @@ L:       alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/twl4030*
 
+TI WILINK WIRELESS DRIVERS
+M:     Luciano Coelho <coelho@ti.com>
+L:     linux-wireless@vger.kernel.org
+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 <jon.maloy@ericsson.com>
 M:     Allan Stephens <allan.stephens@windriver.com>
@@ -7425,23 +7435,6 @@ M:       Miloslav Trmac <mitr@volny.cz>
 S:     Maintained
 F:     drivers/input/misc/wistron_btns.c
 
-WL1251 WIRELESS DRIVER
-M:     Luciano Coelho <coelho@ti.com>
-L:     linux-wireless@vger.kernel.org
-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 <coelho@ti.com>
-L:     linux-wireless@vger.kernel.org
-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 <acme@ghostprotocols.net>
 L:     linux-wireless@vger.kernel.org
@@ -7572,8 +7565,8 @@ F:        Documentation/filesystems/xfs.txt
 F:     fs/xfs/
 
 XILINX AXI ETHERNET DRIVER
-M:     Ariane Keller <ariane.keller@tik.ee.ethz.ch>
-M:     Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+M:     Anirudha Sarangi <anirudh@xilinx.com>
+M:     John Linn <John.Linn@xilinx.com>
 S:     Maintained
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*