diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 13:58:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 13:58:28 -0400 |
| commit | 894e552cfaa3389f934dc68180bac692aebcf26b (patch) | |
| tree | bf0cab9dd4c0596faa05479b4e3d5c2d206afd7d | |
| parent | 3d09c623947a855ab9a21267c31f926cafa2c5bb (diff) | |
| parent | 70b4a2598c4d88842c083eff7e28e8cc287bab5b (diff) | |
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 | |||
| 7948 | 7948 | ||
| 7949 | SECURITY SUBSYSTEM | 7949 | SECURITY SUBSYSTEM |
| 7950 | M: James Morris <james.l.morris@oracle.com> | 7950 | M: James Morris <james.l.morris@oracle.com> |
| 7951 | M: Serge E. Hallyn <serge@hallyn.com> | ||
| 7951 | L: linux-security-module@vger.kernel.org (suggested Cc:) | 7952 | L: linux-security-module@vger.kernel.org (suggested Cc:) |
| 7952 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git | 7953 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git |
| 7953 | W: http://kernsec.org/ | 7954 | W: http://kernsec.org/ |