tree 13530e6f549f997d680eaaba087bdb32f68989b6
parent 1feb6e3c9216a34885f24f0df4a02a30dfb35f19
parent da781c60e5d55904d77931fcb63f25e65e2228be
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1392807885 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1392807885 +0100

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