Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Tue, 7 Oct 2014 20:48:12 +0000 (13:48 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Tue, 7 Oct 2014 20:48:12 +0000 (13:48 -0700)

Trivial merge