tree e6f3990b140ea1f469b5c16cd334404b7d3faedd
parent b89dfcfd926b8224edd24608065eb9bb601c0d3b
parent 8d11f804130d27a8f5ed6954f3a8a7f62a10ac45
author Tom Rini <trini@konsulko.com> 1472394980 -0400
committer Tom Rini <trini@konsulko.com> 1472394980 -0400

Merge branch 'master' of git://git.denx.de/u-boot-uniphier