tree 5fd64361a67785ea5dc57a7759ae7b14a55d1956
parent af6da69f47314e0e8efa3711ffadbfda8d2334aa
parent 8101b98298c4232175d0d7b4c73d94b66b97ef83
author Tom Rini <trini@konsulko.com> 1435779476 -0400
committer Tom Rini <trini@konsulko.com> 1435779476 -0400

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