Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:26:03 +0000 (00:26 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:26:03 +0000 (00:26 +0200)

Trivial merge