diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-05-04 11:38:32 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-05-04 11:38:32 +0300 |
| commit | 4b88524c47d7bffd5aaabf918c7759c74a1c577b (patch) | |
| tree | b1cca2cdf82acd5a25305ed2aa00290b6ccc6a42 /tools/perf/scripts/python/libxed.py | |
| parent | 672c0c5173427e6b3e2a9bbb7be51ceeec78093a (diff) | |
| parent | 2e29b9971ac54dec88baa58856a230ec2f2a2dff (diff) | |
| download | linux-4b88524c47d7bffd5aaabf918c7759c74a1c577b.tar.xz | |
Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next
Merge arm64's SME branch to resolve conflicts with the WFxT branch.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/libxed.py')
0 files changed, 0 insertions, 0 deletions