commit | 9648b7e1555c9b1655d27a607e3256c3648a6655 | [log] [tgz] |
---|---|---|
author | Łukasz Bartosik <ukaszb@google.com> | Fri Apr 15 11:13:11 2022 |
committer | Łukasz Bartosik <ukaszb@google.com> | Fri Apr 15 11:13:11 2022 |
tree | 4427dd8d1c454dc441a601d9cceabe69a9214973 | |
parent | 9364046945317d2a592b1bc9e6d2dea307d8d988 [diff] |
Remove conflict resolution for arch branch for v5.18-rc2 Signed-off-by: Łukasz Bartosik <ukaszb@google.com>