Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 9 Jun 2014 14:49:39 +0000 (07:49 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 9 Jun 2014 14:49:39 +0000 (07:49 -0700)

Trivial merge