Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 19 Jun 2016 03:44:22 +0000 (23:44 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 19 Jun 2016 03:44:22 +0000 (23:44 -0400)

Trivial merge