summaryrefslogtreecommitdiff
path: root/Documentation/scsi/ChangeLog.megaraid_sas
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-07-21 22:17:27 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-07-21 22:17:27 -0700
commita5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch)
tree7f46722dcd4bdce411612d9ccb83651795dad5e3 /Documentation/scsi/ChangeLog.megaraid_sas
parent9b031c86506cef9acae45e61339fcf9deaabb793 (diff)
parenta50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff)
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.
Diffstat (limited to 'Documentation/scsi/ChangeLog.megaraid_sas')
0 files changed, 0 insertions, 0 deletions