From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 14 Jan 2013 16:00:02 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.01~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a17617d6553369ba72c080128ed8d0b0c33dfc89;p=u-boot

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
---

a17617d6553369ba72c080128ed8d0b0c33dfc89