tree dc230c35a77782a5fb9bcda426eccb2102652f52
parent 2ed3f9114300b1f11f1f30d9d2478146afc3af0e
parent 5ba471944abc63e837a29c905ac46ae362d5f6a5
author Tom Rini <trini@ti.com> 1420559312 -0500
committer Tom Rini <trini@ti.com> 1420559312 -0500

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