Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Sat, 21 Feb 2015 13:22:23 +0000 (08:22 -0500)
committerTom Rini <trini@ti.com>
Sat, 21 Feb 2015 13:22:23 +0000 (08:22 -0500)

Trivial merge