| commit | 6b827bd0f81df56d1d42df5bd8f454fe77f69749 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat Aug 09 16:48:34 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat Aug 09 16:48:34 2014 +0200 |
| tree | baed464b3d9250361cd85e931a16d87b397cc36f | |
| parent | d7785242429d66a34e22846be04901e7307eb4c3 [diff] | |
| parent | a54365ff308ceb3c163e50fc4982f58a40a220f6 [diff] |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'