]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-ti
authorTom Rini <trini@ti.com>
Mon, 8 Dec 2014 21:35:06 +0000 (16:35 -0500)
committerTom Rini <trini@ti.com>
Mon, 8 Dec 2014 21:35:06 +0000 (16:35 -0500)

Trivial merge