tree 6331525bc0342e3f3fa0615905851a8a5673142e
parent d035fcf9b6a5a0d7ce8d3d5f3ef960618deea47e
parent a3f170cdbf7ae0bd24c94c2f46725699bbd69f05
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1373628035 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1373628035 +0200

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