| commit | ad31ff6a4f5e420637da256e8d259bc0c63b0d2b | [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 | 82cecfce3fd33e151ed8bc382ae31b19535765c5 [diff] | |
| parent | db824479e64811959494e1f919c31d97fea9dc48 [diff] |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'