Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ff8e763eaa50b962ef1abb24e5d2be73889ed16f..a9c794cb671ea6953a134f3e12cca15830ef7c17 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3928,7 +3928,9 @@ M:        Greg Rose <[email protected]>
 M:     Peter P Waskiewicz Jr <[email protected]>
 M:     Alex Duyck <[email protected]>
 M:     John Ronciak <[email protected]>
+M:     Tushar Dave <[email protected]>
 L:     [email protected]
+W:     http://www.intel.com/support/feedback.htm
 W:     http://e1000.sourceforge.net/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
@@ -6415,6 +6417,7 @@ F:        drivers/scsi/st*
 SCTP PROTOCOL
 M:     Vlad Yasevich <[email protected]>
 M:     Sridhar Samudrala <[email protected]>
+M:     Neil Horman <[email protected]>
 L:     [email protected]
 W:     http://lksctp.sourceforge.net
 S:     Maintained
@@ -7259,6 +7262,14 @@ L:       [email protected]
 S:     Maintained
 F:     arch/xtensa/
 
+THERMAL
+M:      Zhang Rui <[email protected]>
+L:      [email protected]
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
+S:      Supported
+F:      drivers/thermal/
+F:      include/linux/thermal.h
+
 THINKPAD ACPI EXTRAS DRIVER
 M:     Henrique de Moraes Holschuh <[email protected]>
 L:     [email protected]
@@ -7556,6 +7567,12 @@ S:       Maintained
 F:     Documentation/usb/acm.txt
 F:     drivers/usb/class/cdc-acm.*
 
+USB AR5523 WIRELESS DRIVER
+M:     Pontus Fuchs <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/net/wireless/ath/ar5523/
+
 USB ATTACHED SCSI
 M:     Matthew Wilcox <[email protected]>
 M:     Sarah Sharp <[email protected]>