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

Trivial merge