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

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 16fb17c..46a7656 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4055,7 +4055,7 @@ M:        Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
-F:     include/uapi/scsi/cxlflash_ioctls.h
+F:     include/uapi/scsi/cxlflash_ioctl.h
 F:     Documentation/powerpc/cxlflash.txt
 
 CYBERPRO FB DRIVER
@@ -10011,6 +10011,13 @@ S:     Supported
 F:     drivers/gpu/drm/mxsfb/
 F:     Documentation/devicetree/bindings/display/mxsfb.txt
 
+MYLEX DAC960 PCI RAID Controller
+M:     Hannes Reinecke <hare@kernel.org>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/myrb.*
+F:     drivers/scsi/myrs.*
+
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 M:     Chris Lee <christopher.lee@cspi.com>
 L:     netdev@vger.kernel.org