Merge remote-tracking branch 'u-boot-imx/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 20 Sep 2012 22:26:19 +0000 (00:26 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 20 Sep 2012 22:26:19 +0000 (00:26 +0200)

Trivial merge