Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@ti.com>
Mon, 8 Dec 2014 21:35:05 +0000 (16:35 -0500)
committerTom Rini <trini@ti.com>
Mon, 8 Dec 2014 21:35:05 +0000 (16:35 -0500)
commit0fffbd26d55d89ec5241f8e1ce4c5bc77892678b
treee483ead53c177a3e8ad3d6563a893623859c40e3
parent1a9c8f12f2f2824a047ebeb3ae342109677b48cc
parent7a3620b24649663857d99e8ab73ec0b3bd60e50e
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
common/board_r.c