Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 22:48:04 +0000 (18:48 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 22:48:04 +0000 (18:48 -0400)
commit68ff827ec74fdca8f17d469f22e1032ed14cb795
tree882aa0fd6d942bd4001682cbbc5c63f13c23844e
parentbb297ceea8bf6cc0291c556f64f49b89368f10ba
parent12a5ce72738a34eaa11b559778039f1051425dbd
Merge branch 'master' of git://git.denx.de/u-boot-uniphier