]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Fri, 25 Jul 2014 19:05:09 +0000 (15:05 -0400)
committerTom Rini <trini@ti.com>
Fri, 25 Jul 2014 19:05:09 +0000 (15:05 -0400)

Trivial merge