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)
commit2dbbda08b92b006b541a099a3025cac12c6d720e
treebace5d2ed5c6295e5710f8f095d1304fa286c857
parent26f195c71252e98aebfffd5cfa994a4475559370
parentf7ca1f76fd01f3fc7e75fb3fd801c7bef16598db
Merge git://git.denx.de/u-boot-sh