tree da95eeaa6578048658ff60f20a9b498730c67917
parent 480860c8b47937e8dc9ca3eb8573eaed9d996365
parent 2f1e5c6e826b7b6be4051a7ccb3423ddf35d9e2b
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1353844918 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1353844918 +0100

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