Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 25 Nov 2012 12:01:58 +0000 (13:01 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 25 Nov 2012 12:01:58 +0000 (13:01 +0100)

Trivial merge