Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Fri, 25 Apr 2008 22:06:51 +0000 (00:06 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 25 Apr 2008 22:06:51 +0000 (00:06 +0200)

Trivial merge