Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 13 Oct 2015 12:37:38 +0000 (08:37 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 13 Oct 2015 12:37:38 +0000 (08:37 -0400)

Trivial merge