Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Tue, 28 Oct 2014 16:39:26 +0000 (12:39 -0400)
committerTom Rini <trini@ti.com>
Tue, 28 Oct 2014 16:39:26 +0000 (12:39 -0400)

Trivial merge