Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 8 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 19a9a1c53037..5d014725901c 100644
--- 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
@@ -1236,7 +1240,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 +1807,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 +2166,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