Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Wed, 6 Aug 2014 17:26:47 +0000 (10:26 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 6 Aug 2014 17:26:47 +0000 (10:26 -0700)

Trivial merge