]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2021.04-rc5' into next
authorTom Rini <trini@konsulko.com>
Mon, 29 Mar 2021 21:53:19 +0000 (17:53 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 29 Mar 2021 22:00:21 +0000 (18:00 -0400)
Prepare v2021.04-rc5

1  2 
.azure-pipelines.yml
Makefile
common/image-fit.c
doc/develop/driver-model/migration.rst
doc/usage/index.rst
include/dm/test.h
include/image.h

Simple merge
diff --cc Makefile
Simple merge
Simple merge
index fb834349ca3d5fd1ca75879e5ddef64aacb46ce4,6c59bbadab4528767cfa50b1db6e8a9533aecc2a..5faf279f4310d2d2915ef55dc5693c49350a5351
@@@ -4,8 -4,8 +4,9 @@@ Use U-Boo
  .. toctree::
     :maxdepth: 1
  
+    dfu
     fdt_overlays
 +   fit
     netconsole
     partitions
  
Simple merge
diff --cc include/image.h
Simple merge