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)
1  2 
common/board_r.c

Simple merge