Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@ti.com>
Tue, 30 Dec 2014 14:11:56 +0000 (09:11 -0500)
committerTom Rini <trini@ti.com>
Tue, 30 Dec 2014 14:11:56 +0000 (09:11 -0500)
commitf23041a38afd302db862fbbceb81b05590579c40
treed6564cc69ed2f614b5d503712b63617527fa4010
parent87b27c7aa73241d1eb244048f7aee06fc24af4ef
parent7b77c9ab6fa90ada42185bcc64b7d33812fed35d
Merge branch 'master' of git://git.denx.de/u-boot-uniphier