Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Wed, 30 Jul 2014 08:37:37 +0000 (01:37 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 30 Jul 2014 08:37:37 +0000 (01:37 -0700)

Trivial merge