Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Thu, 24 Sep 2015 16:28:02 +0000 (12:28 -0400)
committerTom Rini <[email protected]>
Thu, 24 Sep 2015 16:28:02 +0000 (12:28 -0400)

Trivial merge