Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 4 Jun 2016 13:53:29 +0000 (09:53 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 4 Jun 2016 13:53:29 +0000 (09:53 -0400)

Trivial merge