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

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

fe06d43b504af9ebc6c9bfe511853de6e42f257e