tree ad50491bf8f67237dd3083e2f454fcd2fe40b262
parent 1e6ad55c058200010bb0649524a2c874e7049242
parent 68659d649debc9fb3d8ce21ce4dcfe3a66b63e3a
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1396890822 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1396890822 +0200

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