aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 421504b59c2..a781f2ec082 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2201,6 +2201,11 @@ M: stefanr@s5r6.in-berlin.de
2201L: linux1394-devel@lists.sourceforge.net 2201L: linux1394-devel@lists.sourceforge.net
2202S: Maintained 2202S: Maintained
2203 2203
2204INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
2205P: Mimi Zohar
2206M: zohar@us.ibm.com
2207S: Supported
2208
2204IMS TWINTURBO FRAMEBUFFER DRIVER 2209IMS TWINTURBO FRAMEBUFFER DRIVER
2205L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) 2210L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
2206S: Orphan 2211S: Orphan
@@ -3825,6 +3830,7 @@ M: jmorris@namei.org
3825L: linux-kernel@vger.kernel.org 3830L: linux-kernel@vger.kernel.org
3826L: linux-security-module@vger.kernel.org (suggested Cc:) 3831L: linux-security-module@vger.kernel.org (suggested Cc:)
3827T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git 3832T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
3833W: http://security.wiki.kernel.org/
3828S: Supported 3834S: Supported
3829 3835
3830SECURITY CONTACT 3836SECURITY CONTACT