projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc843ef 79855d1)
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:02 +0000 (07:42 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:25 +0000 (07:42 -0800)
commit096cbc35eaecf5865a3274f21eae26955b32861b
tree8c6f085fd648939bfbc6ae41cd3f0204e32c5e07tree | snapshot
parentdc843ef00e79ef0466d4d66bb20beeccda92e003commit | diff
parent79855d178557cc3e3ffd179fd26a64cef48dfb30commit | 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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/ata/libata-scsi.c diff1 | diff2 | blob | history
drivers/scsi/aacraid/linit.c diff1 | diff2 | blob | history
drivers/scsi/bnx2fc/bnx2fc_fcoe.c diff1 | diff2 | blob | history
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c diff1 | diff2 | blob | history
drivers/scsi/scsi.c diff1 | diff2 | blob | history
drivers/scsi/scsi_error.c diff1 | diff2 | blob | history
drivers/scsi/scsi_scan.c diff1 | diff2 | blob | history
drivers/scsi/ufs/ufshcd.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.