Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Thu, 9 Nov 2017 13:11:30 +0000 (08:11 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 9 Nov 2017 13:11:30 +0000 (08:11 -0500)

Trivial merge