Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 2 Jan 2008 10:30:58 +0000 (11:30 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 2 Jan 2008 10:30:58 +0000 (11:30 +0100)

Trivial merge