Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Thu, 3 Jul 2014 18:04:27 +0000 (11:04 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 3 Jul 2014 18:04:27 +0000 (11:04 -0700)

Trivial merge