| commit | 096cbc35eaecf5865a3274f21eae26955b32861b | [log] [tgz] |
|---|---|---|
| author | James Bottomley <JBottomley@Parallels.com> | Mon Dec 08 07:42:02 2014 -0800 |
| committer | James Bottomley <JBottomley@Parallels.com> | Mon Dec 08 07:42:25 2014 -0800 |
| tree | 8c6f085fd648939bfbc6ae41cd3f0204e32c5e07 | |
| parent | dc843ef00e79ef0466d4d66bb20beeccda92e003 [diff] | |
| parent | 79855d178557cc3e3ffd179fd26a64cef48dfb30 [diff] |
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 <JBottomley@Parallels.com>