Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Thu, 23 Jul 2015 15:46:05 +0000 (11:46 -0400)
committerTom Rini <[email protected]>
Thu, 23 Jul 2015 15:46:05 +0000 (11:46 -0400)

Trivial merge