]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca4a213 a3902ee)
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
1  2 
drivers/scsi/qla2xxx/qla_os.c patch | diff1 | diff2 | blob | history
drivers/scsi/sg.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge
diff --cc drivers/scsi/sg.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.