From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 9 Sep 2014 07:19:10 +0000 (+0200)
Subject: Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.10-rc3~116^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6bc0195dba895fa0e9facc718d17eb098695685;p=u-boot

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

a6bc0195dba895fa0e9facc718d17eb098695685