Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Tue, 25 Nov 2008 10:32:10 +0000 (11:32 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Nov 2008 10:32:10 +0000 (11:32 +0100)

Trivial merge