Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

894e552c · Linus Torvalds <[email protected]> · 2014-06-19 07:58:28 -10:00

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

Commit: 894e552cfaa3389f934dc68180bac692aebcf26b
Parents: 3d09c623 · 70b4a259

Merge commit. Changes below are compared with the first parent: 3d09c623.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
MAINTAINERS	modified	+1	−0	View file

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 134483f..e36d18d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7948,6 +7948,7 @@ F:	drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
 M:	James Morris <[email protected]>
+M:	Serge E. Hallyn <[email protected]>
 L:	[email protected] (suggested Cc:)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:	http://kernsec.org/