X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=MAINTAINERS;h=24741de12a39b8d680974f385770842e0b376bf0;hb=0ebb26e7a4e2c5337502e98b2221e037fda911b9;hp=8f2b67ea0549c0f8d45fe265cfff0245a6b20419;hpb=2433c41789d6aa6797ca747707b7764e88e4fb6d;p=linux-2.6-omap-h63xx.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 8f2b67ea054..24741de12a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3759,6 +3759,15 @@ M:	drzeus-sdhci@drzeus.cx
 L:	sdhci-devel@list.drzeus.cx
 S:	Maintained
 
+SECURITY SUBSYSTEM
+F:	security/
+P:	James Morris
+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
+S:	Supported
+
 SECURITY CONTACT
 P:	Security Officers
 M:	security@kernel.org