| commit | 6b1365567a74ca94d6741859f06847a7b2ee194d | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 19 18:01:55 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 19 18:01:55 2013 +0200 |
| tree | 4d103cc29ebdad680ad75f77db473fbd3df5e7e5 | |
| parent | fef4fe44c499680ef22c5a7c8a6888fbe5133c17 [diff] | |
| parent | 5b37beacdc7990d06377a8a4726c3c2f6031709e [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'