Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[profile/ivi/kernel-x86-ivi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d919e3d..f883fc1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3438,6 +3438,18 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:     Maintained
 F:     arch/ia64/
 
+IBM Power in-Nest Crypto Acceleration
+M:     Kent Yoder <key@linux.vnet.ibm.com>
+L:     linux-crypto@vger.kernel.org
+S:     Supported
+F:     drivers/crypto/nx/
+
+IBM Power 842 compression accelerator
+M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+S:     Supported
+F:     drivers/crypto/nx/nx-842.c
+F:     include/linux/nx842.h
+
 IBM Power Linux RAID adapter
 M:     Brian King <brking@us.ibm.com>
 S:     Supported