]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27ba104 5f68189)
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)
commit638c9f83f5f5a07dd740400add3cfaca3b1c2105
tree8c6f085fd648939bfbc6ae41cd3f0204e32c5e07tree | snapshot
parent27ba1048db88151b88fe06634a8017b14fe6f673commit | diff
parent5f681894dfb81bf1ec897dfec37ecdab97c73b8acommit | 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
Linux Kernel Source Tree.