Merge git://git.denx.de/u-boot-imx
authorTom Rini <[email protected]>
Fri, 29 Dec 2017 14:27:04 +0000 (09:27 -0500)
committerTom Rini <[email protected]>
Fri, 29 Dec 2017 14:27:04 +0000 (09:27 -0500)

Trivial merge