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)
commit951d77fd5a541d68eeb7372e72cd4757e3058517
tree74ddfe541cc01e61dbcaf946b604c01863637c65
parent27ea13e6186c1a5bd0fa2b0d6f854d60ca4ca4c9
parent8beb330044d0d1878c7b92290e91c0b889e92633
Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
drivers/ata/libata-eh.c
drivers/scsi/scsi_error.c