diff options
author | Bjorn Andersson <andersson@kernel.org> | 2024-08-14 22:12:27 -0500 |
---|---|---|
committer | Bjorn Andersson <andersson@kernel.org> | 2024-08-14 22:12:27 -0500 |
commit | 3f780bba3fc35f8a1beb9f198d51228395c3658a (patch) | |
tree | 13d311e6edd387cf15865c0ba662f26e5d9f4ec6 /tools/perf/scripts/python/syscall-counts.py | |
parent | 79cb2cb8d89b7eca87e8dac031dadea4aeafeaa7 (diff) | |
parent | 924fc22c282edbf93869b150d9e1b47e0b10485e (diff) |
Merge branch 'drivers-fixes-for-6.11' into HEAD
Merge drivers-fixes-for-6.11 branch into drivers-for-6.12 to avoid the
(trivial) merge conflict occuring related to the qcom_pdm_domains
update.
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions