Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Jul 2013 11:20:35 +0000 (13:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Jul 2013 11:20:35 +0000 (13:20 +0200)

Trivial merge