Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 2 Jan 2017 21:32:05 +0000 (16:32 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 2 Jan 2017 21:32:05 +0000 (16:32 -0500)

Trivial merge