| commit | ae65f83c59196afb45bee8d63782cd0ab60dbaf6 | [log] [tgz] |
|---|---|---|
| author | Jędrzej Ciupis <jciupis@google.com> | Fri Nov 08 06:57:10 2024 |
| committer | Jędrzej Ciupis <jciupis@google.com> | Fri Nov 15 08:04:58 2024 |
| tree | a1b5ba1c68211efe44c60202f108c60979092d8e | |
| parent | f065890a7749a3728ad678aaa8a41f56306fb04b [diff] |
Update conflict resolutions for bluetooth for v6.12-rc5 Change-Id: I61d37e7afcf4c7d4cbb435fd68e170a4e1cd98c0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel-rebase-patches/+/6003468 Tested-by: Jędrzej Ciupis <jciupis@google.com> Reviewed-by: Tomasz Figa <tfiga@chromium.org>