Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Wed, 9 Jul 2014 13:21:51 +0000 (09:21 -0400)
committerTom Rini <trini@ti.com>
Wed, 9 Jul 2014 13:21:51 +0000 (09:21 -0400)

Trivial merge