tree baed464b3d9250361cd85e931a16d87b397cc36f
parent e76b933e02e1b38e48754c435e9dba1c0deeb3c6
parent 3340eab26d89176dd0bf543e6d2590665c577423
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'