Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894e552c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3d09c623 70b4a259

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -7948,6 +7948,7 @@ F: drivers/mmc/host/sdhci-spear.c 




SECURITY SUBSYSTEM

SECURITY SUBSYSTEM

M:	James Morris <james.l.morris@oracle.com>

M:	James Morris <james.l.morris@oracle.com>

M:	Serge E. Hallyn <serge@hallyn.com>

L:	linux-security-module@vger.kernel.org (suggested Cc:)

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git

W:	http://kernsec.org/

W:	http://kernsec.org/