diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-07-02 13:21:23 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-07-02 13:30:30 +0300 |
| commit | 88e326b3316a8c6d86c528d31a8da31444716d73 (patch) | |
| tree | ea4977c6676f961645acf2505cc15a446b409d07 /scripts/git-resolve.sh | |
| parent | be91bf40a96d567973d5c5e870d1464eb51b6c42 (diff) | |
| parent | 4f30f946f27b7f044cf8f3f1f353dee1dcd3517a (diff) | |
Merge branch 'fixes' into for-next
Merge fixes back into for-next to be able to take dell_rbu change that
is build on top of fixes material, and to bring lenovo related changes
in sync after the move under lenovo/ subdir in the for-next branch and
diverging changes in the fixes branch.
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions