diff options
| author | Bjorn Andersson <[email protected]> | 2024-06-06 17:38:08 -0500 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2024-06-06 17:38:08 -0500 |
| commit | 80edfc18de69508e37b6668d668194a3e9556f5e (patch) | |
| tree | 3be0111f4f813f87c565238496d2a4cfd1867e16 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | bc90f56a169987975072efa56c3b595eda19668a (diff) | |
| parent | 8e99e770f7eab8f8127098df7824373c4b4e8b5c (diff) | |
Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11
Merge the arm64-fixes-for-6.10 branch into arm64-for-6.11 to resolve the
merge conflict caused by pmic-glink and reserved-memory introduction at
the same place in the x1e80100 crd and qcp dts files.
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions