| commit | a8343ebca2aedb40da294de843b5b99c025d454c | [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 | b56eeed8023a07223ab751ae577b49cf8f40261d [diff] | |
| parent | 5fd7c5de6a582a45bf8c227ce46132d91f066ea3 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'