Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[platform/upstream/kernel-adaptation-pc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 60c68fb..85c1402 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4001,7 +4001,8 @@ S:        Maintained
 F:     arch/ia64/
 
 IBM Power in-Nest Crypto Acceleration
-M:     Kent Yoder <key@linux.vnet.ibm.com>
+M:     Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com>
+M:     Fionnuala Gunter <fin@linux.vnet.ibm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/nx/
@@ -4130,6 +4131,7 @@ F:        drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Dmitry Kasatkin <d.kasatkin@samsung.com>
 S:     Supported
 F:     security/integrity/ima/
 
@@ -8282,7 +8284,8 @@ S:        Odd fixes
 F:     drivers/media/usb/tm6000/
 
 TPM DEVICE DRIVER
-M:     Kent Yoder <key@linux.vnet.ibm.com>
+M:     Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
+M:     Ashley Lai <ashley@ashleylai.com>
 M:     Rajiv Andrade <mail@srajiv.net>
 W:     http://tpmdd.sourceforge.net
 M:     Marcel Selhorst <tpmdd@selhorst.net>