1 files changed, 22 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index df77a5b2c36c..100198ea76b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3333,7 +3333,6 @@ F:	drivers/net/wimax/i2400m/
 F:      include/linux/wimax/i2400m.h
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
-M:      Reinette Chatre <reinette.chatre@intel.com>
 M:      Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
@@ -3680,6 +3679,28 @@ F:	include/linux/key-type.h
 F:      include/keys/
 F:      security/keys/
 
+KEYS-TRUSTED
+M:      David Safford <safford@watson.ibm.com>
+M:      Mimi Zohar <zohar@us.ibm.com>
+L:      linux-security-module@vger.kernel.org
+L:      keyrings@linux-nfs.org
+S:      Supported
+F:      Documentation/keys-trusted-encrypted.txt
+F:      include/keys/trusted-type.h
+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>
+L:      linux-security-module@vger.kernel.org
+L:      keyrings@linux-nfs.org
+S:      Supported
+F:      Documentation/keys-trusted-encrypted.txt
+F:      include/keys/encrypted-type.h
+F:      security/keys/encrypted.c
+F:      security/keys/encrypted.h
+
 KGDB / KDB /debug_core
 M:      Jason Wessel <jason.wessel@windriver.com>
 W:      http://kgdb.wiki.kernel.org/