tree 87bfb4c157d998f88fee99e196a6f36a6b483903
parent 76b40ab41eff1f402ee52ba768b09daad293b9bb
parent 08f0533a147ca37546a6539b43fce3916e82811a
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1363105664 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1363105664 +0100

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