Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Fri, 11 Jul 2014 18:54:48 +0000 (14:54 -0400)
committerTom Rini <trini@ti.com>
Fri, 11 Jul 2014 18:54:48 +0000 (14:54 -0400)

Trivial merge