From: Wolfgang Denk <wd@denx.de>
Date: Thu, 15 Jul 2010 20:48:46 +0000 (+0200)
Subject: Merge branch 'master' of ../master
X-Git-Tag: v2013.04~3890
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658;p=bsp%2Fu-boot.git

Merge branch 'master' of ../master
---

93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658