Merge remote-tracking branch 'mkp-scsi/4.6/scsi-queue' into misc
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 15 Mar 2016 22:35:03 +0000 (15:35 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 15 Mar 2016 22:35:03 +0000 (15:35 -0700)

Trivial merge