From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 30 Jun 2014 21:00:34 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.07~74^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d6694aff569a0838a9d0ef352128f5aa309d73ff;p=u-boot

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

d6694aff569a0838a9d0ef352128f5aa309d73ff