Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2e83c82..5519d25 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2980,8 +2980,10 @@ P:       Stephen Smalley
 M:     sds@tycho.nsa.gov
 P:     James Morris
 M:     jmorris@namei.org
+P:     Eric Paris
+M:     eparis@parisplace.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
-L:     selinux@tycho.nsa.gov (general discussion)
+L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:     http://www.nsa.gov/selinux
 S:     Supported