From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 7 Apr 2014 17:13:42 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.04~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=284bb60ed6636df3794ba102dd4325a96f1206e9;p=oweals%2Fu-boot.git

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

284bb60ed6636df3794ba102dd4325a96f1206e9