| commit | 9028c8ee8163b7bde497efb235825b86005d284f | [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 | e0f6fbab18017e794d08bf9f64347712fe8cc87b [diff] | |
| parent | 044a5e8c1108d92a45752c7fcb0c9b8608b3cae0 [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'