| commit | c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Nov 05 20:50:39 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Nov 05 20:50:39 2013 +0100 |
| tree | da81a7a9b2616bfb0db1331089b390c7c92af247 | |
| parent | f6723794fd8f3362c4f3b5d0f36607a6a6f107b2 [diff] | |
| parent | c12f941bece9ed79efccfe9e4a9fd977da6975f9 [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'