Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 12 Dec 2016 12:18:53 +0000 (07:18 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 12 Dec 2016 12:18:53 +0000 (07:18 -0500)
commitfe9822556e051e6c24a3832532166ade00a81a8c
treef33860f004f973dbc30a42431691d28b84857603
parent170397f17d3b7731bfc754efad9fb6e626a5a639
parent6c498835af560ad850de4dad4ff8c60d26ef2898
Merge branch 'master' of git://git.denx.de/u-boot-uniphier