]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'misc' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 20 Apr 2021 15:01:41 +0000 (08:01 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 20 Apr 2021 15:01:41 +0000 (08:01 -0700)
commit755e78ccbb075197205c37a16956e23b23f517d0
treebcfce02547efc16a3ef9f5cc13fd9991d0130e4e
parent15cc26df65526838f7c56ca6f636d6c565d220d5
parent7a3beeae289385f7be9f61a33a6e4f6c7e2400d3
Merge branch 'misc' into for-next

Conflicts:
drivers/target/iscsi/iscsi_target.c
drivers/target/iscsi/iscsi_target.c