From: James Bottomley Date: Mon, 8 Dec 2014 15:42:02 +0000 (-0800) Subject: Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus X-Git-Tag: firefly_0821_release~176^2~2775^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=096cbc35eaecf5865a3274f21eae26955b32861b;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus Conflicts: drivers/scsi/scsi_debug.c Agreed and tested resolution to a merge problem between a fix in scsi_debug and a driver update Signed-off-by: James Bottomley --- 096cbc35eaecf5865a3274f21eae26955b32861b