tree a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08
parent f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552
parent 7c48b015100eeff0e1bbb766394f7beca23afb48
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1406535165 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1406535165 +0200

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'