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

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 19a9a1c530371a9328af010d96d2544e88289378..423103e5d9557bb9857da24f2f20ca8e5dc86624 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -370,6 +370,10 @@ W: http://www.thekelleys.org.uk/atmel
 W:     http://atmelwlandriver.sourceforge.net/
 S:     Maintained
 
+AUDIT SUBSYSTEM
+L:     linux-audit@redhat.com (subscribers-only)
+S:     Maintained
+
 AX.25 NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
@@ -987,6 +991,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
@@ -1236,7 +1247,7 @@ S:        Maintained
 
 IRDA SUBSYSTEM
 P:     Jean Tourrilhes
-L:     irda-users@lists.sourceforge.net
+L:     irda-users@lists.sourceforge.net (subscribers-only)
 W:     http://irda.sourceforge.net/
 S:     Maintained
 
@@ -1803,8 +1814,9 @@ M:        greg@kroah.com
 S:     Maintained
 
 PCMCIA SUBSYSTEM
+P:     Linux PCMCIA Team
 L:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
-S:     Unmaintained
+S:     Maintained
 
 PCNET32 NETWORK DRIVER
 P:     Thomas Bogendörfer
@@ -2161,7 +2173,7 @@ UltraSPARC (sparc64):
 P:     David S. Miller
 M:     davem@davemloft.net
 P:     Eddie C. Dost
-M:     ecd@skynet.be
+M:     ecd@brainaid.de
 P:     Jakub Jelinek
 M:     jj@sunsite.ms.mff.cuni.cz
 P:     Anton Blanchard