Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:55:47 +0000 (23:55 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:55:47 +0000 (23:55 +0200)

Trivial merge