Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@ti.com>
Thu, 27 Nov 2014 18:10:04 +0000 (13:10 -0500)
committerTom Rini <trini@ti.com>
Thu, 27 Nov 2014 18:10:04 +0000 (13:10 -0500)
commite17e998d7fee2e7d381b7bff21aca3714387d5d7
tree082fb0e66aa0463886d18294f0e29504626019a6
parent38cd8c4253013ccdd4052ee021f6066fe9a52551
parent25e274e20208e047ea93afde04040e8c87430904
Merge branch 'master' of git://git.denx.de/u-boot-uniphier