Merge tag 'isci-for-3.5' into misc
[linux-3.10.git] / MAINTAINERS
index b362709..8795204 100644 (file)
@@ -1598,6 +1598,7 @@ F:        include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
 M:     Jing Huang <huangj@brocade.com>
+M:     Krishna C Gudipati <kgudipat@brocade.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bfa/
@@ -6883,6 +6884,14 @@ F:       Documentation/cdrom/
 F:     drivers/cdrom/cdrom.c
 F:     include/linux/cdrom.h
 
+UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
+M:     Vinayak Holikatti <vinholikatti@gmail.com>
+M:     Santosh Y <santoshsy@gmail.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     Documentation/scsi/ufs.txt
+F:     drivers/scsi/ufs/
+
 UNSORTED BLOCK IMAGES (UBI)
 M:     Artem Bityutskiy <dedekind1@gmail.com>
 W:     http://www.linux-mtd.infradead.org/