Merge git://git.denx.de/u-boot-imx
authorTom Rini <[email protected]>
Wed, 27 Jun 2018 17:09:55 +0000 (13:09 -0400)
committerTom Rini <[email protected]>
Wed, 27 Jun 2018 17:09:55 +0000 (13:09 -0400)

Trivial merge