summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-01-16 14:43:13 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-01-16 14:43:13 +1100
commit56912e7c63707108958226909b097891815e99a0 (patch)
treeb9ee4fe6db155d939030b2ea6bbea3f2e619a3bb
parentbaa59341a59df0d92596720f08f7d33968e792ca (diff)
parentc8334dc8fb6413b363df3e1419e287f5b25bce32 (diff)
Merge commit 'security-testing/next'
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d7078cc705a0..605f32db0776 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3830,6 +3830,7 @@ M: jmorris@namei.org
L: linux-kernel@vger.kernel.org
L: linux-security-module@vger.kernel.org (suggested Cc:)
T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+W: http://security.wiki.kernel.org/
S: Supported
SECURITY CONTACT