Merge tag 'v3.14' into next

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 900d98eec2fcb6fef620ac4b5b0afdcbea637fb5..ae2e14142253ac17677c0248fac110edcbeb42db 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7730,11 +7730,10 @@ M:      Security Officers <security@kernel.org>
 S:     Supported
 
 SELINUX SECURITY MODULE
+M:     Paul Moore <paul@paul-moore.com>
 M:     Stephen Smalley <sds@tycho.nsa.gov>
-M:     James Morris <james.l.morris@oracle.com>
 M:     Eric Paris <eparis@parisplace.org>
-M:     Paul Moore <paul@paul-moore.com>
-L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
+L:     selinux@tycho.nsa.gov (moderated for non-subscribers)
 W:     http://selinuxproject.org
 T:     git git://git.infradead.org/users/pcmoore/selinux
 S:     Supported