Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (719741d9) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5861,7 +5861,7 @@ S: Maintained
	F: drivers/mmc/host/sdhci-spear.c		F: drivers/mmc/host/sdhci-spear.c

	SECURITY SUBSYSTEM		SECURITY SUBSYSTEM
	M: James Morris <jmorris@namei.org>		M: James Morris <james.l.morris@oracle.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://security.wiki.kernel.org/		W: http://security.wiki.kernel.org/
	@@ -5874,7 +5874,7 @@ S: Supported

	SELINUX SECURITY MODULE		SELINUX SECURITY MODULE
	M: Stephen Smalley <sds@tycho.nsa.gov>		M: Stephen Smalley <sds@tycho.nsa.gov>
	M: James Morris <jmorris@namei.org>		M: James Morris <james.l.morris@oracle.com>
	M: Eric Paris <eparis@parisplace.org>		M: Eric Paris <eparis@parisplace.org>
	L: selinux@tycho.nsa.gov (subscribers-only, general discussion)		L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
	W: http://selinuxproject.org		W: http://selinuxproject.org