From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 2 Feb 2013 18:29:59 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.04-rc1~48^2~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e5f5c4a977c411c0cd3899a4f9487eea77a0e150;p=u-boot

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

e5f5c4a977c411c0cd3899a4f9487eea77a0e150