Merge with /home/sr/git/u-boot/cfi-update
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 20 Nov 2006 09:27:39 +0000 (10:27 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 20 Nov 2006 09:27:39 +0000 (10:27 +0100)

Trivial merge