tree baed464b3d9250361cd85e931a16d87b397cc36f
parent d7785242429d66a34e22846be04901e7307eb4c3
parent a54365ff308ceb3c163e50fc4982f58a40a220f6
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1407595714 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1407595714 +0200

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