Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f1ed75cef6a4a592f3fcef2bcfb1379217793acc..90dcbbcad91c8541326d7179e7bc313880b8bf10 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -163,6 +163,12 @@ M: A2232@gmx.net
 L:     linux-m68k@lists.linux-m68k.org
 S:     Maintained
 
+AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
+P:     David Howells
+M:     dhowells@redhat.com
+L:     linux-afs@lists.infradead.org
+S:     Supported
+
 AIO
 P:     Benjamin LaHaise
 M:     bcrl@kvack.org
@@ -2314,8 +2320,6 @@ L:        kexec@lists.infradead.org
 S:     Maintained
 
 KPROBES
-P:     Prasanna S Panchamukhi
-M:     prasanna@in.ibm.com
 P:     Ananth N Mavinakayanahalli
 M:     ananth@in.ibm.com
 P:     Anil S Keshavamurthy