diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-12 21:41:54 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-12 21:41:54 -0400 |
| commit | 84b20b8062e76a0290aee7360c8238df681c106e (patch) | |
| tree | 9716475914c1a7caaca229a25b8aa0f2a2c52221 /scripts/gdb/linux/modules.py | |
| parent | 857a80bbd7321161f986588160d97815d1b1206a (diff) | |
| parent | 5cd0f6f57639c5afbb36100c69281fee82c95ee7 (diff) | |
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
Resolve a couple of conflicts between the 5.12 fixes branch and the
5.13 staging tree (iSCSI target and UFS).
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'scripts/gdb/linux/modules.py')
0 files changed, 0 insertions, 0 deletions