aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS17
1 files changed, 13 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c3074e275cb4..4b54fda5ac72 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/
1527S: Maintained 1527S: Maintained
1528 1528
1529ECRYPT FILE SYSTEM 1529ECRYPT FILE SYSTEM
1530P: Mike Halcrow, Phillip Hellewell 1530P: Tyler Hicks, Dustin Kirkland
1531M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net 1531M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
1532L: ecryptfs-devel@lists.sourceforge.net 1532L: ecryptfs-devel@lists.launchpad.net
1533W: http://ecryptfs.sourceforge.net/ 1533W: https://launchpad.net/ecryptfs
1534S: Supported 1534S: Supported
1535 1535
1536EDAC-CORE 1536EDAC-CORE
@@ -3764,6 +3764,15 @@ M: drzeus-sdhci@drzeus.cx
3764L: sdhci-devel@list.drzeus.cx 3764L: sdhci-devel@list.drzeus.cx
3765S: Maintained 3765S: Maintained
3766 3766
3767SECURITY SUBSYSTEM
3768F: security/
3769P: James Morris
3770M: jmorris@namei.org
3771L: linux-kernel@vger.kernel.org
3772L: linux-security-module@vger.kernel.org (suggested Cc:)
3773T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
3774S: Supported
3775
3767SECURITY CONTACT 3776SECURITY CONTACT
3768P: Security Officers 3777P: Security Officers
3769M: security@kernel.org 3778M: security@kernel.org