diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 07:58:28 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 07:58:28 -1000 |
| commit | 894e552cfaa3389f934dc68180bac692aebcf26b (patch) | |
| tree | bf0cab9dd4c0596faa05479b4e3d5c2d206afd7d | |
| parent | Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff) | |
| parent | security: add Serge Hallyn as a maintainer (diff) | |
| download | linux-dev-894e552cfaa3389f934dc68180bac692aebcf26b.tar.xz linux-dev-894e552cfaa3389f934dc68180bac692aebcf26b.zip | |
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-- | MAINTAINERS | 1 |
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/ |