From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 28 Jun 2013 15:51:13 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.07-rc3~4^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c;p=pandora-u-boot.git

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

e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c