tree 2c92b6fb6dc329695dc703293b6ea260263cca70
parent b65e2c1fc7161f251866d787368842a4ff9e1c0b
parent f22d759ff97007ed5b67143701940b09a35bdc84
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1389795484 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1389795484 +0100

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