Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 7 Apr 2014 17:13:42 +0000 (19:13 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 7 Apr 2014 17:13:42 +0000 (19:13 +0200)

Trivial merge