| commit | 1899fac925eda817e12234aef3d01d354788662e | [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 | e76b933e02e1b38e48754c435e9dba1c0deeb3c6 [diff] | |
| parent | 3340eab26d89176dd0bf543e6d2590665c577423 [diff] |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'