X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=3d29fa3898883a51626b527ab0f0b21badb815ce;hb=cb4361c1dc29cd870f664c004b1817106fbce0fa;hp=1a203f9626f64b2aee9d091e85d083e26eed91fc;hpb=6631424fd2efd75e7394b318ad2a8597327857a9;p=~andy%2Flinux

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a203f9626f..3d29fa38988 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1443,7 +1443,7 @@ F:	arch/powerpc/platforms/cell/
 
 CEPH DISTRIBUTED FILE SYSTEM CLIENT
 M:	Sage Weil <sage@newdream.net>
-L:	ceph-devel@lists.sourceforge.net
+L:	ceph-devel@vger.kernel.org
 W:	http://ceph.newdream.net/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 S:	Supported
@@ -3270,6 +3270,16 @@ S:	Maintained
 F:	include/linux/kexec.h
 F:	kernel/kexec.c
 
+KEYS/KEYRINGS:
+M:	David Howells <dhowells@redhat.com>
+L:	keyrings@linux-nfs.org
+S:	Maintained
+F:	Documentation/keys.txt
+F:	include/linux/key.h
+F:	include/linux/key-type.h
+F:	include/keys/
+F:	security/keys/
+
 KGDB
 M:	Jason Wessel <jason.wessel@windriver.com>
 L:	kgdb-bugreport@lists.sourceforge.net