Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 259d32d8c84b4e3c47bb947d6d365afa1151b0f3..bf206bd9f056c6fdc9d49f2d24d9f7a634c12db5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6093,16 +6093,6 @@ F:       drivers/scsi/hpsa*.[ch]
 F:     include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
 
-HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
-M:     Don Brace <don.brace@microsemi.com>
-L:     esc.storagedev@microsemi.com
-L:     linux-scsi@vger.kernel.org
-S:     Supported
-F:     Documentation/blockdev/cciss.txt
-F:     drivers/block/cciss*
-F:     include/linux/cciss_ioctl.h
-F:     include/uapi/linux/cciss_ioctl.h
-
 HFI1 DRIVER
 M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
 M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
@@ -11609,6 +11599,7 @@ F:      drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 M:     Steffen Maier <maier@linux.vnet.ibm.com>
+M:     Benjamin Block <bblock@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -13695,8 +13686,7 @@ F:      Documentation/scsi/ufs.txt
 F:     drivers/scsi/ufs/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
-M:     Manjunath M Bettegowda <manjumb@synopsys.com>
-M:     Prabu Thangamuthu <prabut@synopsys.com>
+M:     Joao Pinto <jpinto@synopsys.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ufs/*dwc*