Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 651af5012c981d4b877f3119d965830855620faf..c21909a4041480ee09bd0ba32f80f0d10effa83e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -576,10 +576,9 @@ S: Supported
 
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:     Michael H. Warfield
-M:     Michael H. Warfield <mhw@wittsend.com>
+M:     mhw@wittsend.com
 W:     http://www.wittsend.com/computone.html
-L:     linux-computone@lazuli.wittsend.com
-S:     Orphaned
+S:     Maintained
 
 COSA/SRP SYNC SERIAL DRIVER
 P:     Jan "Yenya" Kasprzak
@@ -988,6 +987,13 @@ M: mike.miller@hp.com
 L:     iss_storagedev@hp.com
 S:     Supported
  
+HOST AP DRIVER
+P:     Jouni Malinen
+M:     jkmaline@cc.hut.fi
+L:     hostap@shmoo.com
+W:     http://hostap.epitest.fi/
+S:     Maintained
+
 HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:     Jaroslav Kysela
 M:     perex@suse.cz
@@ -1330,6 +1336,16 @@ M:       rml@novell.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+KEXEC
+P:     Eric Biederman
+P:     Randy Dunlap
+M:     ebiederm@xmission.com
+M:     rddunlap@osdl.org
+W:     http://www.xmission.com/~ebiederm/files/kexec/
+L:     linux-kernel@vger.kernel.org
+L:     fastboot@osdl.org
+S:     Maintained
+
 LANMEDIA WAN CARD DRIVER
 P:     Andrew Stanley-Jones
 M:     asj@lanmedia.com
@@ -2115,9 +2131,7 @@ S:        Maintained
 SOFTWARE SUSPEND:
 P:     Pavel Machek
 M:     pavel@suse.cz
-M:     pavel@ucw.cz
-L:     http://lister.fornax.hu/mailman/listinfo/swsusp
-W:     http://swsusp.sf.net/
+L:     linux-pm@osdl.org
 S:     Maintained
 
 SONIC NETWORK DRIVER
@@ -2145,6 +2159,11 @@ W:       http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net
 S:     Maintained
 
+TENSILICA XTENSA PORT (xtensa):
+P:     Chris Zankel
+M:     chris@zankel.net
+S:     Maintained
+
 UltraSPARC (sparc64):
 P:     David S. Miller
 M:     davem@davemloft.net
@@ -2589,7 +2608,7 @@ M:        davidm@snapgear.com
 P:     D. Jeff Dionne (created first uClinux port)
 M:     jeff@uclinux.org
 W:     http://www.uclinux.org/
-L:     uclinux-dev@uclinux.org
+L:     uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 
 UCLINUX FOR NEC V850