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)

Trivial merge