Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Tue, 27 Jan 2009 19:54:33 +0000 (20:54 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Jan 2009 19:54:33 +0000 (20:54 +0100)

Trivial merge