diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
| commit | a3a8d13f625d9f20664515d61d4c9a9452119d21 (patch) | |
| tree | 8d3bd45b741f10980c141cc35c06143a82e8ea18 /MAINTAINERS | |
| parent | scsi: target: Remove tpg_list and se_portal_group.se_tpg_node (diff) | |
| parent | scsi: MAINTAINERS: Update qla2xxx driver (diff) | |
| download | linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.xz linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.zip | |
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for
5.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 296de2b51c83..b9c0ca414a74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13359,7 +13359,7 @@ S: Maintained F: drivers/scsi/qla1280.[ch] QLOGIC QLA2XXX FC-SCSI DRIVER -M: qla2xxx-upstream@qlogic.com +M: hmadhani@marvell.com L: linux-scsi@vger.kernel.org S: Supported F: Documentation/scsi/LICENSE.qla2xxx |