From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 1 Jul 2014 13:11:18 +0000 (+0200)
Subject: Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
X-Git-Tag: v2025.01-rc5-pxa1908~15123^2~2
X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=e99f30e105a253ee64bef1ef83b86a47e0d3b6f1;p=u-boot.git

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

e99f30e105a253ee64bef1ef83b86a47e0d3b6f1