From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 15 Mar 2013 14:18:31 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.04-rc2~24^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6579d15c58e2b6b051f126ea8b77dd767252aa14;p=u-boot

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

6579d15c58e2b6b051f126ea8b77dd767252aa14