commit | 964564d89a9e863341788d72cf04edc064e363c9 | [log] [tgz] |
---|---|---|
author | Łukasz Bartosik <ukaszb@google.com> | Wed Apr 20 11:01:21 2022 |
committer | Łukasz Bartosik <ukaszb@google.com> | Wed Apr 20 11:01:21 2022 |
tree | 523482a9aa028df9c9022683914cadb7193556e7 | |
parent | 9648b7e1555c9b1655d27a607e3256c3648a6655 [diff] |
Add conflict resolution for acpi branch for v5.18-rc3 Signed-off-by: Łukasz Bartosik <ukaszb@google.com>