| commit | e825b100d209a9d3c79b2998452cafa94eec986a | [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 | b03b25caea1ff3a501161f5bc1ad5e5b5b124e0c [diff] | |
| parent | 66a62ce0dc48d2319938c72f34a562f519c5d5c2 [diff] |
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'