From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 16 May 2014 15:56:50 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.07-rc2~9^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6a2f30a03acbf226aeb5a93783e6172aa0682d78;p=u-boot

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

6a2f30a03acbf226aeb5a93783e6172aa0682d78