From: Wolfgang Denk <wd@denx.de>
Date: Sun, 24 Apr 2011 22:58:45 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
X-Git-Tag: v2011.06-rc1~138
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f02efacc515e35695e52ecd08762835c8a74a463;p=oweals%2Fu-boot.git

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

f02efacc515e35695e52ecd08762835c8a74a463