Merge git://git.denx.de/u-boot-ti
authorTom Rini <trini@ti.com>
Fri, 7 Nov 2014 21:18:35 +0000 (16:18 -0500)
committerTom Rini <trini@ti.com>
Fri, 7 Nov 2014 21:18:35 +0000 (16:18 -0500)

Trivial merge