Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Fri, 13 Feb 2015 18:11:09 +0000 (13:11 -0500)
committerTom Rini <trini@ti.com>
Fri, 13 Feb 2015 18:11:09 +0000 (13:11 -0500)

Trivial merge