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: v2013.10-rc1~22^2~78
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=8b485ba12b0defa0c4ed3559789250238f8331a8

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

8b485ba12b0defa0c4ed3559789250238f8331a8