diff --git a/[refs] b/[refs] index be1f288adab0..575d54e7f72a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: feaf3848a813a106f163013af6fcf6c4bfec92d9 +refs/heads/master: 8711cca2251f1fc3beb870a75ff847bb55225490 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8f2b67ea0549..24741de12a39 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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