Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 11 Feb 2009 21:24:51 +0000 (22:24 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Feb 2009 21:24:51 +0000 (22:24 +0100)

Trivial merge