From: Tom Rini <trini@konsulko.com>
Date: Mon, 29 Mar 2021 21:53:19 +0000 (-0400)
Subject: Merge tag 'v2021.04-rc5' into next
X-Git-Tag: v2025.01-rc5-pxa1908~1941^2~2
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=1057b1be75386e3513dca392d8258e01e5cccc01;p=u-boot.git

Merge tag 'v2021.04-rc5' into next

Prepare v2021.04-rc5
---

1057b1be75386e3513dca392d8258e01e5cccc01
diff --cc doc/usage/index.rst
index fb834349ca,6c59bbadab..5faf279f43
--- a/doc/usage/index.rst
+++ b/doc/usage/index.rst
@@@ -4,8 -4,8 +4,9 @@@ Use U-Boo
  .. toctree::
     :maxdepth: 1
  
+    dfu
     fdt_overlays
 +   fit
     netconsole
     partitions