Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Mon, 13 Oct 2008 12:18:38 +0000 (14:18 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Oct 2008 12:18:38 +0000 (14:18 +0200)

Trivial merge