Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Wed, 30 Jul 2014 07:59:19 +0000 (00:59 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 30 Jul 2014 07:59:19 +0000 (00:59 -0700)

Trivial merge