]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'fixes' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Apr 2021 06:27:07 +0000 (23:27 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Apr 2021 06:27:07 +0000 (23:27 -0700)
commitb0cda40f7f0ac72c3b2825f497846a0083e5ad61
tree53a96ae93bc45ddd13b5a803e0a5e8c917f833f8
parentbce99128eaf7d2864865f958515794e991bf8159
parent5cd0f6f57639c5afbb36100c69281fee82c95ee7
Merge branch 'fixes' into for-next

 Conflicts:
drivers/target/iscsi/iscsi_target.c
drivers/scsi/pm8001/pm8001_hwi.c
drivers/target/iscsi/iscsi_target.c