diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
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/ | |||
1527 | S: Maintained | 1527 | S: Maintained |
1528 | 1528 | ||
1529 | ECRYPT FILE SYSTEM | 1529 | ECRYPT FILE SYSTEM |
1530 | P: Mike Halcrow, Phillip Hellewell | 1530 | P: Tyler Hicks, Dustin Kirkland |
1531 | M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net | 1531 | M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com |
1532 | L: ecryptfs-devel@lists.sourceforge.net | 1532 | L: ecryptfs-devel@lists.launchpad.net |
1533 | W: http://ecryptfs.sourceforge.net/ | 1533 | W: https://launchpad.net/ecryptfs |
1534 | S: Supported | 1534 | S: Supported |
1535 | 1535 | ||
1536 | EDAC-CORE | 1536 | EDAC-CORE |
@@ -3764,6 +3764,15 @@ M: drzeus-sdhci@drzeus.cx | |||
3764 | L: sdhci-devel@list.drzeus.cx | 3764 | L: sdhci-devel@list.drzeus.cx |
3765 | S: Maintained | 3765 | S: Maintained |
3766 | 3766 | ||
3767 | SECURITY SUBSYSTEM | ||
3768 | F: security/ | ||
3769 | P: James Morris | ||
3770 | M: jmorris@namei.org | ||
3771 | L: linux-kernel@vger.kernel.org | ||
3772 | L: linux-security-module@vger.kernel.org (suggested Cc:) | ||
3773 | T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
3774 | S: Supported | ||
3775 | |||
3767 | SECURITY CONTACT | 3776 | SECURITY CONTACT |
3768 | P: Security Officers | 3777 | P: Security Officers |
3769 | M: security@kernel.org | 3778 | M: security@kernel.org |