Merge tag 'v3.12'

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ffcaf975bed7e399197e0fd93c761d9ff7c8570d..12911367264eb138157fc3e42133cac22a2e96e3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7437,9 +7437,10 @@ SELINUX SECURITY MODULE
 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)
 W:     http://selinuxproject.org
-T:     git git://git.infradead.org/users/eparis/selinux.git
+T:     git git://git.infradead.org/users/pcmoore/selinux
 S:     Supported
 F:     include/linux/selinux*
 F:     security/selinux/