From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 25 Jun 2014 08:39:58 +0000 (+0200)
Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.07~74^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed1d98d801dfb6384d0f2fff45ce1ebf884944ca;p=u-boot

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

ed1d98d801dfb6384d0f2fff45ce1ebf884944ca