Merge branch 'master' into next
[linux-2.6.git] / MAINTAINERS
index cad81a2..926485c 100644 (file)
@@ -3650,8 +3650,9 @@ M:        jmorris@namei.org
 P:     Eric Paris
 M:     eparis@parisplace.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
-L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
-W:     http://www.nsa.gov/selinux
+L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
+W:     http://selinuxproject.org
+T:     git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 S:     Supported
 
 SENSABLE PHANTOM