tree 46fa6efb55aae1ffc38278b4cf660367d8001e7e
parent b1432102d2dd04b33f5d2154c88f01998e9c37a5
parent 5ffc0a2457a161d7f3cfeee5dd494448bb5482fa
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1378375489 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1378375489 +0200

Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'