Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@ti.com>
Thu, 22 Jan 2015 16:24:11 +0000 (11:24 -0500)
committerTom Rini <trini@ti.com>
Fri, 23 Jan 2015 01:04:06 +0000 (20:04 -0500)
commit032c6867a2925c95897afe07d1f0678114254cf6
tree880d379cab669b1a1da81c46a487987c1a6baf78
parent1d6a95011ffa25241c2e9c112893f6c6c96f2b46
parent0ba924a4ecfe056ab637bfa207fc26cd0248e9ac
Merge branch 'master' of git://git.denx.de/u-boot-uniphier