aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-10-10 11:09:47 +1100
committerJames Morris <jmorris@namei.org>2008-10-10 11:09:47 +1100
commit9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch)
treef2715b294d64efe1c5788f4fa5f0b25cdff071a7 /MAINTAINERS
parent3fa8749e584b55f1180411ab1b51117190bac1e5 (diff)
parent81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff)
downloadlinux-linaro-stable-9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14.tar.gz
Merge branch 'next' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8dae4555f10e..7a03bd5a91a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3649,8 +3649,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