tree 6cd2fa04929473afda1cceaa297cd340792bd326
parent 6166c11813c3aacfea18ac94c89e122d98cad5fa
parent 61c179f2f25cd523d3ba4c3ed4737807bb6672a1
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1380718407 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1380718407 +0200

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