| commit | 2570d018e3ec79e4ab61d81a428e591dc8fdc5bc | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 05 12:04:49 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 05 12:04:49 2013 +0200 |
| tree | 46fa6efb55aae1ffc38278b4cf660367d8001e7e | |
| parent | b1432102d2dd04b33f5d2154c88f01998e9c37a5 [diff] | |
| parent | 5ffc0a2457a161d7f3cfeee5dd494448bb5482fa [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'