From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 25 Jul 2013 15:57:46 +0000 (+0200)
Subject: Merge branch 'u-boot/master' into u-boot-arm/master
X-Git-Tag: v2025.01-rc5-pxa1908~15977^2~78
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=8b485ba12b0defa0c4ed3559789250238f8331a8;p=u-boot.git

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

8b485ba12b0defa0c4ed3559789250238f8331a8