From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 4 Aug 2011 16:59:59 +0000 (+0200)
Subject: Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'
X-Git-Tag: v2011.09-rc1~85^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9023ae305919d0aecb4a22726b9d08c6b08189d7;p=u-boot

Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'
---

9023ae305919d0aecb4a22726b9d08c6b08189d7