Merge branch 'fixes' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Sep 2016 14:49:00 +0000 (10:49 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Sep 2016 14:49:00 +0000 (10:49 -0400)
commit237870b3374e53844f151ff29dad30d21f8e0253
tree86d4a09d7cac69c12840a75ce173087143a9184c
parent151770524b73816a00a785bd613ea80398b33190
parent14a5916e0cce6dbc9acedc99576261c6568689d2
Merge branch 'fixes' into for-next

Conflicts:
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/ipr.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/mpt3sas/mpt3sas_base.c
This page took 0.025896 seconds and 5 git commands to generate.