From: Wolfgang Denk <wd@denx.de>
Date: Thu, 16 Dec 2010 22:00:53 +0000 (+0100)
Subject: Merge branch 'master' of ../master into next
X-Git-Tag: v2013.04~3472^2~27
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=006915fbb0e3c1c9927fe32c4e92cb011f8499e7;p=bsp%2Fu-boot.git

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

006915fbb0e3c1c9927fe32c4e92cb011f8499e7