Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Wed, 22 Oct 2014 17:51:45 +0000 (13:51 -0400)
committerTom Rini <trini@ti.com>
Wed, 22 Oct 2014 17:51:45 +0000 (13:51 -0400)

Trivial merge