From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 15 Jan 2014 14:18:04 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.01~21^2~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=bf46e7d8d134521301ff02b6d97e8998aa10a83d

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

bf46e7d8d134521301ff02b6d97e8998aa10a83d