From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 24 Feb 2015 06:59:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'
X-Git-Tag: v2015.04-rc4~31^2~25
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e1cc4d31f889428a4ca73120951389c756404184;p=u-boot

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

e1cc4d31f889428a4ca73120951389c756404184