Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Thu, 18 Dec 2014 13:56:29 +0000 (05:56 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 18 Dec 2014 13:56:29 +0000 (05:56 -0800)

Trivial merge