summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-19 07:58:28 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-19 07:58:28 -1000
commit894e552cfaa3389f934dc68180bac692aebcf26b (patch)
treebf0cab9dd4c0596faa05479b4e3d5c2d206afd7d
parent3d09c623947a855ab9a21267c31f926cafa2c5bb (diff)
parent70b4a2598c4d88842c083eff7e28e8cc287bab5b (diff)
downloadlinux-894e552cfaa3389f934dc68180bac692aebcf26b.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security maintainership update from James Morris: "Add Serge Hallyn as security subsystem co-maintainer" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: security: add Serge Hallyn as a maintainer
-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/