diff options
author | 2020-07-21 22:17:27 -0700 | |
---|---|---|
committer | 2020-07-21 22:17:27 -0700 | |
commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'elan-i2c' into next (diff) | |
parent | Input: elan_i2c - add more hardware ID for Lenovo laptops (diff) | |
download | linux-rng-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.xz linux-rng-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.zip |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions