commit | 59d3142b80681fd753ff7fa919d9dfd7fac336c5 | [log] [tgz] |
---|---|---|
author | Łukasz Bartosik <ukaszb@google.com> | Mon May 22 22:56:22 2023 |
committer | Łukasz Bartosik <ukaszb@google.com> | Tue May 23 00:12:29 2023 |
tree | 24da72d6ffbedc7a6150b5ae1fa898d83f2910a0 | |
parent | c80877ab442c1bc9075185fd5305698351f163eb [diff] |
Fix conflict resolutions for power-thermal branch for v6.4-rc1 Signed-off-by: Łukasz Bartosik <ukaszb@google.com> Kcr-depends-on-sha: waived