]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
1  2 
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/sg.c

Simple merge
Simple merge