Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git] / MAINTAINERS
index 2328eed6aea905b49ae438e8bdb9bfed02e1e06b..9d42bb8bb1203264a216bfe65eecaca73d47c812 100644 (file)
@@ -3252,12 +3252,11 @@ F:      drivers/net/ieee802154/cc2520.c
 F:     include/linux/spi/cc2520.h
 F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 
-CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
+CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 M:     Gilad Ben-Yossef <gilad@benyossef.com>
 L:     linux-crypto@vger.kernel.org
-L:     driverdev-devel@linuxdriverproject.org
 S:     Supported
-F:     drivers/staging/ccree/
+F:     drivers/crypto/ccree/
 W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 
 CEC FRAMEWORK
@@ -6962,7 +6961,7 @@ F:        drivers/input/input-mt.c
 K:     \b(ABS|SYN)_MT_
 
 INSIDE SECURE CRYPTO DRIVER
-M:     Antoine Tenart <antoine.tenart@free-electrons.com>
+M:     Antoine Tenart <antoine.tenart@bootlin.com>
 F:     drivers/crypto/inside-secure/
 S:     Maintained
 L:     linux-crypto@vger.kernel.org
@@ -7200,6 +7199,14 @@ L:       linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/i40iw/
 
+INTEL SHA MULTIBUFFER DRIVER
+M:     Megha Dey <megha.dey@linux.intel.com>
+R:     Tim Chen <tim.c.chen@linux.intel.com>
+L:     linux-crypto@vger.kernel.org
+S:     Supported
+F:     arch/x86/crypto/sha*-mb
+F:     crypto/mcryptd.c
+
 INTEL TELEMETRY DRIVER
 M:     Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 L:     platform-driver-x86@vger.kernel.org