Merge remote-tracking branch 'u-boot-imx/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 29 Sep 2012 09:12:34 +0000 (11:12 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 29 Sep 2012 09:12:34 +0000 (11:12 +0200)

Trivial merge