Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Fri, 12 Dec 2014 01:47:34 +0000 (20:47 -0500)
committerTom Rini <trini@ti.com>
Fri, 12 Dec 2014 01:47:34 +0000 (20:47 -0500)

Trivial merge