From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 27 Oct 2012 09:43:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'u-boot-imx/master'
X-Git-Tag: v2013.01-rc2~146^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f04821a8ca714459481bd9fd315af2b5f92d99a6;p=oweals%2Fu-boot.git

Merge remote-tracking branch 'u-boot-imx/master'
---

f04821a8ca714459481bd9fd315af2b5f92d99a6