Merge tag 'u-boot-rockchip-20210606' of https://source.denx.de/u-boot/custodians...
authorTom Rini <trini@konsulko.com>
Mon, 7 Jun 2021 11:22:14 +0000 (07:22 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 7 Jun 2021 11:22:14 +0000 (07:22 -0400)

Trivial merge