Merge with /home/mk/11-cmb1920/u-boot
authorWolfgang Denk <wd@pollux.denx.de>
Thu, 13 Jul 2006 20:12:58 +0000 (22:12 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Thu, 13 Jul 2006 20:12:58 +0000 (22:12 +0200)

Trivial merge