diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2024-06-06 17:38:08 -0500 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2024-06-06 17:38:08 -0500 |
| commit | 80edfc18de69508e37b6668d668194a3e9556f5e (patch) | |
| tree | 3be0111f4f813f87c565238496d2a4cfd1867e16 /tools/perf/scripts/python | |
| parent | arm64: dts: sm8650-hdk: add support for the Display Card overlay (diff) | |
| parent | arm64: dts: qcom: x1e80100: Fix PCIe 6a reg offsets and add MHI (diff) | |
| download | linux-80edfc18de69508e37b6668d668194a3e9556f5e.tar.gz linux-80edfc18de69508e37b6668d668194a3e9556f5e.zip | |
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')
0 files changed, 0 insertions, 0 deletions