From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 14 Jan 2014 10:50:54 +0000 (+0100)
Subject: Merge 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.01~22^2~1
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=e6fe4bd989b93b1f37a25771fc14478dd33aa0df

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

e6fe4bd989b93b1f37a25771fc14478dd33aa0df