diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-20 14:22:06 +0200 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-21 14:00:38 +0200 |
| commit | 0da9a3f9ac8ada83fa79579455871ec59f11db72 (patch) | |
| tree | 48a22c56221b8c9b3639cf132330117baf2c5181 /tools/perf/scripts/python/parallel-perf.py | |
| parent | 3ef4ea516c2f8a2f1ff8ca59b156fb2e4472c2a4 (diff) | |
| parent | 59616a91e5e74833b2008b56c66879857c616006 (diff) | |
Merge branch 'fixes' into 'for-next'
Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
Diffstat (limited to 'tools/perf/scripts/python/parallel-perf.py')
0 files changed, 0 insertions, 0 deletions