From: Wolfgang Denk <wd@denx.de>
Date: Sat, 23 Oct 2010 19:45:57 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2010.12-rc1~37
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=678150f155f0cc69ce7868f53d91e3ab2859510b;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-sh
---

678150f155f0cc69ce7868f53d91e3ab2859510b