Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 9 Sep 2016 13:45:32 +0000 (09:45 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 9 Sep 2016 13:45:32 +0000 (09:45 -0400)

Trivial merge