Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Tue, 2 Sep 2014 12:22:26 +0000 (08:22 -0400)
committerTom Rini <trini@ti.com>
Tue, 2 Sep 2014 12:22:26 +0000 (08:22 -0400)

Trivial merge