From: James Morris <james.l.morris@oracle.com>
Date: Wed, 18 Jun 2014 08:57:50 +0000 (+1000)
Subject: security: add Serge Hallyn as a maintainer
X-Git-Tag: omap-for-v3.16/fixes-rc4~83^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b4a2598c4d88842c083eff7e28e8cc287bab5b;p=pandora-kernel.git

security: add Serge Hallyn as a maintainer

Add Serge E. Hallyn <serge@hallyn.com> as a co-maintainer of the
security subsystem, to avoid having a single point of failure
in the development process.

Signed-off-by: James Morris <james.l.morris@oracle.com>
---

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/