git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27ea13e 8beb330)
Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 18 Jun 2016 18:59:01 +0000 (11:59 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 18 Jun 2016 18:59:01 +0000 (11:59 -0700)
1  2 
drivers/ata/libata-eh.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_error.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ata/libata-eh.c
Simple merge
diff --cc drivers/scsi/scsi_error.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.