Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-block.git] / MAINTAINERS
index 99540a5a4e19e9dd06af672dcea7df58f1debbac..8f22f6af3782104927b4fa37fbe3c2df27f98a86 100644 (file)
@@ -7578,14 +7578,6 @@ S:       Supported
 F:     drivers/infiniband/hw/i40iw/
 F:     include/uapi/rdma/i40iw-abi.h
 
-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