]> git.sur5r.net Git - u-boot/commitdiff
Merge git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Tue, 4 Nov 2014 23:24:44 +0000 (18:24 -0500)
committerTom Rini <trini@ti.com>
Tue, 4 Nov 2014 23:24:44 +0000 (18:24 -0500)

Trivial merge