From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 12 Jul 2013 11:20:35 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.07-rc3~4^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=efc284e32503b240dbd35c6e8b8d098d702b4be7;p=u-boot

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

efc284e32503b240dbd35c6e8b8d098d702b4be7