Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:23:39 +0000 (23:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:23:39 +0000 (23:23 +0200)

Trivial merge