From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sun, 25 Nov 2012 12:01:58 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.01-rc3~13^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a7c467960ffb4d5a5e1eef5f7783fb6f594542;p=pandora-u-boot.git

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

b8a7c467960ffb4d5a5e1eef5f7783fb6f594542