Merge remote-tracking branch 'mkp-scsi/4.6/scsi-fixes' into misc
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 22 Mar 2016 11:33:04 +0000 (07:33 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 22 Mar 2016 11:33:04 +0000 (07:33 -0400)

Trivial merge