Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 3 Oct 2005 07:33:12 +0000 (09:33 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Mon, 3 Oct 2005 07:33:12 +0000 (09:33 +0200)

Trivial merge