commit | b0d6ed68d6e60a35353a71ce8e803a9a98f5edac | [log] [tgz] |
---|---|---|
author | Łukasz Bartosik <ukaszb@google.com> | Mon May 09 12:33:02 2022 |
committer | Łukasz Bartosik <ukaszb@google.com> | Mon May 09 12:33:02 2022 |
tree | c5d1716db31bf74b5e542c878d9dc7c0d59fabe0 | |
parent | 60043829202d39bff3c2b588facc5002036cef79 [diff] |
Add conflict resolution for bluetooth branch for v5.18-rc5 Signed-off-by: Łukasz Bartosik <ukaszb@google.com>