| commit | 612404c28a64a6df300642a1550a65dcc8e01f82 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Jan 09 20:01:48 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Jan 09 20:01:48 2013 +0100 |
| tree | 5be664967ba39c93dc27da5cc547d350e7c0fc17 | |
| parent | ea33fb1a32e8e3f408b311823cabbb7453148f80 [diff] | |
| parent | ac81e1ccf7135d8004763bbf9bef1d95a03fbe92 [diff] |
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'