ipv6: sit: add GSO/TSO support

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7a86b44a4c562b7856578bf5a1b5052976431afe..f169259ccdc69a34ca94ee84f828a50c299cb78c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1653,7 +1653,7 @@ F:        include/linux/backlight.h
 
 BATMAN ADVANCED
 M:     Marek Lindner <mareklindner@neomailbox.ch>
-M:     Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
+M:     Simon Wunderlich <sw@simonwunderlich.de>
 M:     Antonio Quartulli <antonio@meshcoding.com>
 L:     b.a.t.m.a.n@lists.open-mesh.org
 W:     http://www.open-mesh.org/
@@ -6830,6 +6830,14 @@ L:       linux-hexagon@vger.kernel.org
 S:     Supported
 F:     arch/hexagon/
 
+QUALCOMM WCN36XX WIRELESS DRIVER
+M:     Eugene Krasnikov <k.eugene.e@gmail.com>
+L:     wcn36xx@lists.infradead.org
+W:     http://wireless.kernel.org/en/users/Drivers/wcn36xx
+T:     git git://github.com/KrasnikovEugene/wcn36xx.git
+S:     Supported
+F:     drivers/net/wireless/ath/wcn36xx/
+
 QUICKCAM PARALLEL PORT WEBCAMS
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org