| commit | 20d6b8fcc7cf27d742cd13432d5a1ce22a3880f4 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jan 14 17:00:02 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jan 14 17:00:02 2013 +0100 |
| tree | c8903ddc48e628192c56cc95667f702fd1d77c6e | |
| parent | 90a4cc823f781777ca336080ccd058bf0bb653fe [diff] | |
| parent | c74d323726571c6b9d89ef98230114bd284e39a2 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'