Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 10 Nov 2016 18:22:23 +0000 (10:22 -0800)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 10 Nov 2016 18:22:23 +0000 (10:22 -0800)

Trivial merge