| commit | 754466ac95e92ebf40e25c6af6f13ab9b4d7c87b | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jun 24 19:54:20 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jun 24 19:54:20 2014 +0200 |
| tree | a63da2cacba9786c93f209a7f44c663c50d768a7 | |
| parent | aed39f354eb663bce7bfbf54c89397b14da2ed64 [diff] | |
| parent | 6dbeb893c4a7668d0098318d6668ccf59bfbfdea [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'