From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 9 Aug 2014 14:48:34 +0000 (+0200)
Subject: Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.10-rc2~73^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1899fac925eda817e12234aef3d01d354788662e;p=pandora-u-boot.git

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

1899fac925eda817e12234aef3d01d354788662e