Merge git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 18 May 2018 11:11:11 +0000 (07:11 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 18 May 2018 11:11:11 +0000 (07:11 -0400)

Trivial merge