From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 9 Jan 2013 15:57:03 +0000 (+0100)
Subject: Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.01~9^2~12
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ea33fb1a32e8e3f408b311823cabbb7453148f80;p=karo-tx-uboot.git

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

ea33fb1a32e8e3f408b311823cabbb7453148f80