diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-07 17:20:43 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-07 17:20:43 -0400 |
commit | 11e50ed239b5b7f383874dd737283ae93f62ece3 (patch) | |
tree | 6f990dd80caf1efee86926541b30cad9e2003cef /CREDITS | |
parent | 88f1669019bd62b3009a3cebf772fbaaa21b9f38 (diff) | |
parent | fce54ed027577517df1e74b7d54dc2b1bd536887 (diff) | |
download | linux-11e50ed239b5b7f383874dd737283ae93f62ece3.tar.gz |
Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging
Bring in fixes to resolve a merge conflict in the lpfc driver update.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions