| commit | 29e6eb37a6f1c14e7cbdb4ed6d6fb74bdf8f564c | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat May 11 00:06:03 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat May 11 00:06:03 2013 +0200 |
| tree | e1654c4d745839eba8d37f67d15acde79382e23e | |
| parent | b6b8aaa754030c2c354518c3b3c2f0d1800b7963 [diff] | |
| parent | 3d0c5233123ac3a463bba6e93f03e10971eaf714 [diff] |
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'