From 5a5f2acfd04269e2e0958067216b68ff461c285c Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 18 Sep 2013 13:14:04 -0400 Subject: selinux: add Paul Moore as a SELinux maintainer Signed-off-by: Paul Moore Acked-by: Eric Paris Signed-off-by: James Morris --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index e61c2e83fc2b..4fde7066de70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE M: Stephen Smalley M: James Morris M: Eric Paris +M: Paul Moore L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://selinuxproject.org -T: git git://git.infradead.org/users/eparis/selinux.git +T: git git://git.infradead.org/users/pcmoore/selinux S: Supported F: include/linux/selinux* F: security/selinux/ -- cgit v1.2.3 From 901486b89b8ee1c87148d6681c4a1c49d921effe Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 22 Oct 2013 19:28:30 +0200 Subject: tpm: MAINTAINERS: Add myself as tpm maintainer Since I'm actively maintaining the tpm subsystem for a few months now, it's time to step up and be an official maintainer for the tpm subsystem, atleast until I hear something different from my company. The maintaining is done solely in my private time, out of private interest. Speaking only on behalf of myself, trying to be as vendor neutral as possible. Signed-off-by: Peter Huewe --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4fde7066de70..936adb4e6b39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8475,6 +8475,7 @@ F: drivers/media/usb/tm6000/ TPM DEVICE DRIVER M: Leonidas Da Silva Barbosa M: Ashley Lai +M: Peter Huewe M: Rajiv Andrade W: http://tpmdd.sourceforge.net M: Marcel Selhorst -- cgit v1.2.3