Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 26 May 2015 14:38:01 +0000 (10:38 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 26 May 2015 14:38:01 +0000 (10:38 -0400)

Trivial merge