From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 8 Jan 2013 13:59:37 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.01-rc3~9^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7528cf5f016b5b8b8b12b373f6f31a10bf89233d;p=u-boot

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

7528cf5f016b5b8b8b12b373f6f31a10bf89233d