Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <[email protected]>
Mon, 14 Jan 2013 16:00:02 +0000 (17:00 +0100)
committerAlbert ARIBAUD <[email protected]>
Mon, 14 Jan 2013 16:00:02 +0000 (17:00 +0100)

Trivial merge