Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 17 May 2016 16:10:35 +0000 (12:10 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 17 May 2016 16:10:35 +0000 (12:10 -0400)

Trivial merge