Merge git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Thu, 12 Oct 2017 17:36:37 +0000 (13:36 -0400)
committerTom Rini <[email protected]>
Thu, 12 Oct 2017 17:36:37 +0000 (13:36 -0400)

Trivial merge