From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 17 Sep 2014 21:35:34 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.10-rc3~79^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c292adae170fa8c27dca75963bdb0a9afc640e57;p=u-boot

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

c292adae170fa8c27dca75963bdb0a9afc640e57