Merge branch 'for-tom' of git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Sat, 27 Sep 2014 00:10:48 +0000 (20:10 -0400)
committerTom Rini <trini@ti.com>
Sat, 27 Sep 2014 00:10:48 +0000 (20:10 -0400)

Trivial merge