Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 20 Apr 2020 12:45:27 +0000 (08:45 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 20 Apr 2020 12:45:27 +0000 (08:45 -0400)

Trivial merge