Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Thu, 30 Apr 2009 20:59:45 +0000 (22:59 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 30 Apr 2009 20:59:45 +0000 (22:59 +0200)

Trivial merge