summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-06-18 10:57:50 +0200
committerJames Morris <james.l.morris@oracle.com>2014-06-18 10:57:50 +0200
commit70b4a2598c4d88842c083eff7e28e8cc287bab5b (patch)
tree1cc75836c369fdfb1df571e4cc640a914ef36a4a /MAINTAINERS
parentMerge tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-70b4a2598c4d88842c083eff7e28e8cc287bab5b.tar.xz
linux-70b4a2598c4d88842c083eff7e28e8cc287bab5b.zip
security: add Serge Hallyn as a maintainer
Add Serge E. Hallyn <serge@hallyn.com> as a co-maintainer of the security subsystem, to avoid having a single point of failure in the development process. Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 134483f206e4..e36d18d8f0eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7948,6 +7948,7 @@ F: drivers/mmc/host/sdhci-spear.c
SECURITY SUBSYSTEM
M: James Morris <james.l.morris@oracle.com>
+M: Serge E. Hallyn <serge@hallyn.com>
L: linux-security-module@vger.kernel.org (suggested Cc:)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
W: http://kernsec.org/