tree c1ab908fb4fac09839c672c765b98a0512d1e9d1
parent c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d
parent c93addb5635630847e8a33f6dba4afef78a6d180
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1383813136 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1383813136 +0100

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