diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-05-12 00:18:11 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-05-12 00:18:11 +0300 |
| commit | 593ee93aa710ea0159f363b2f1950ecb6c9ddca2 (patch) | |
| tree | 806cc74dd9a3f0481f320455b0a59e21300f7958 /tools/perf/scripts/python | |
| parent | f94ffc3f0b90bf4880e0abf2c056fc465e2c3be8 (diff) | |
| parent | bfcfe6d335a967f8ea0c1980960e6f0205b5de6e (diff) | |
Merge branch 'fixes' into for-next
Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable
applying a few amd/hsmp patches that depend on changes in the fixes
branch.
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions