]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 12 Apr 2017 14:29:17 +0000 (07:29 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 12 Apr 2017 14:29:17 +0000 (07:29 -0700)
1  2 
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_os.c

Simple merge
Simple merge