]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'misc' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 10 Apr 2021 17:51:19 +0000 (10:51 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 10 Apr 2021 17:51:19 +0000 (10:51 -0700)
commit15cc26df65526838f7c56ca6f636d6c565d220d5
tree1af4e9195ecb78c38ba245b2bf985bffc442be91
parente0f4c0603e68ace0e3b2aa60f67d2ab9a7b26b1f
parent857a80bbd7321161f986588160d97815d1b1206a
Merge branch 'misc' into for-next

 Conflicts:
drivers/scsi/ufs/ufshcd.c
drivers/scsi/libsas/sas_ata.c
drivers/scsi/ufs/ufshcd.c