Merge 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 14 Jan 2014 10:50:54 +0000 (11:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 14 Jan 2014 10:50:54 +0000 (11:50 +0100)

Trivial merge