Smack: adds smackfs/ptrace interface

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 21c038f..576816d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1368,6 +1368,9 @@ T:        git git://git.xilinx.com/linux-xlnx.git
 S:     Supported
 F:     arch/arm/mach-zynq/
 F:     drivers/cpuidle/cpuidle-zynq.c
+N:     zynq
+N:     xilinx
+F:     drivers/clocksource/cadence_ttc_timer.c
 
 ARM SMMU DRIVER
 M:     Will Deacon <will.deacon@arm.com>
@@ -3322,7 +3325,9 @@ F:        Documentation/filesystems/ext4.txt
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+L:     linux-ima-devel@lists.sourceforge.net
+L:     linux-security-module@vger.kernel.org
 S:     Supported
 F:     security/integrity/evm/
 
@@ -4336,8 +4341,11 @@ S:       Maintained
 F:     drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:     Dmitry Kasatkin <d.kasatkin@samsung.com>
+L:     linux-ima-devel@lists.sourceforge.net
+L:     linux-ima-user@lists.sourceforge.net
+L:     linux-security-module@vger.kernel.org
 S:     Supported
 F:     security/integrity/ima/
 
@@ -5000,8 +5008,8 @@ F:        include/keys/
 F:     security/keys/
 
 KEYS-TRUSTED
-M:     David Safford <safford@watson.ibm.com>
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     David Safford <safford@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@linux-nfs.org
 S:     Supported
@@ -5011,8 +5019,8 @@ F:        security/keys/trusted.c
 F:     security/keys/trusted.h
 
 KEYS-ENCRYPTED
-M:     Mimi Zohar <zohar@us.ibm.com>
-M:     David Safford <safford@watson.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     David Safford <safford@us.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@linux-nfs.org
 S:     Supported
@@ -7578,11 +7586,10 @@ M:      Security Officers <security@kernel.org>
 S:     Supported
 
 SELINUX SECURITY MODULE
+M:     Paul Moore <paul@paul-moore.com>
 M:     Stephen Smalley <sds@tycho.nsa.gov>
-M:     James Morris <james.l.morris@oracle.com>
 M:     Eric Paris <eparis@parisplace.org>
-M:     Paul Moore <paul@paul-moore.com>
-L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
+L:     selinux@tycho.nsa.gov (moderated for non-subscribers)
 W:     http://selinuxproject.org
 T:     git git://git.infradead.org/users/pcmoore/selinux
 S:     Supported
@@ -8729,14 +8736,10 @@ S:      Odd fixes
 F:     drivers/media/usb/tm6000/
 
 TPM DEVICE DRIVER
-M:     Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Ashley Lai <ashley@ashleylai.com>
 M:     Peter Huewe <peterhuewe@gmx.de>
-M:     Rajiv Andrade <mail@srajiv.net>
-W:     http://tpmdd.sourceforge.net
+M:     Ashley Lai <ashley@ashleylai.com>
 M:     Marcel Selhorst <tpmdd@selhorst.net>
-M:     Sirrix AG <tpmdd@sirrix.com>
-W:     http://www.sirrix.com
+W:     http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/char/tpm/