Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Mon, 12 Dec 2016 12:18:53 +0000 (07:18 -0500)
committerTom Rini <[email protected]>
Mon, 12 Dec 2016 12:18:53 +0000 (07:18 -0500)

Trivial merge