From: Wolfgang Denk <wd@denx.de>
Date: Mon, 7 Apr 2008 21:55:47 +0000 (+0200)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
X-Git-Tag: v1.3.3-rc1~118
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=23c5189e6c969255f8c91b30fdf1cf81b698329d;p=oweals%2Fu-boot.git

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

23c5189e6c969255f8c91b30fdf1cf81b698329d