[U-Boot] Rebase on u-boot-imx !

[Stefano Babic]

Hi i.MXlers,

rather after Tom merged Simon's DM branch, u-boot-imx had a lot of
conflicts and it could not be pulled. I had to rebase it on current
Tom's development tree, I apologize for the inconvenients.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================