| commit | 7528cf5f016b5b8b8b12b373f6f31a10bf89233d | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jan 08 14:59:37 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jan 08 14:59:37 2013 +0100 |
| tree | de91b38f0b5a9c06c2000b02372a7cc1c2655e3e | |
| parent | 79f38777947ac7685e2cef8bd977f954ab198c0e [diff] | |
| parent | 1411fb37b5a8d56bececc5e6ea09d2e0670b9810 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'