diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-16 14:04:38 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-16 14:05:54 +0100 |
| commit | 2de2fe0510d525c9d7197e8618b88bf2e7a00223 (patch) | |
| tree | d10a3caf79b7f054f02194e1ee80c94aa6cae07b /recipes-bsp/u-boot/u-boot_%.bbappend | |
| parent | 5e1ad1e63a85287656bb8bd41c85e1979bc2c03c (diff) | |
linux-toradex-mainline: fix conflict resolution
Fix conflict resolution from forward porting commit 91fc2ff
("linux-toradex-mainline: bump version to patch-level 154")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp/u-boot/u-boot_%.bbappend')
0 files changed, 0 insertions, 0 deletions