Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:40:20 +0000 (07:40 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:40:20 +0000 (07:40 -0800)

Trivial merge