commit | 2b9ff094e4fb018e8d84f1a96f3b40133fc45e35 | [log] [tgz] |
---|---|---|
author | Albert Jakieła <jakiela@google.com> | Fri Nov 15 14:38:17 2024 |
committer | Albert Jakieła <jakiela@google.com> | Fri Nov 15 14:39:18 2024 |
tree | 26a79add024962411c1ac1fe6d6d3f1b4881c7db | |
parent | ae65f83c59196afb45bee8d63782cd0ab60dbaf6 [diff] |
Add conflict resolution for dts for v6.12-rc5 Kcr-depends-on-sha: ed0639b6f36e4b684ffadd862fa5db109b62f627: 08319745ea56f2c4f59d063ef5953e363d5ab52a- Kcr-depends-on-sha: b5c0c6674eaffe8af4bcf4a472dd9571958932b8: e630c7b0b6a69f667c80e68035c843a653664d0d Kcr-depends-on-sha: d76f457b8e99916da6f243771ba6971ef3f8f2b9