Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Sat, 22 Mar 2008 23:53:43 +0000 (00:53 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 22 Mar 2008 23:53:43 +0000 (00:53 +0100)

Trivial merge