Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@pollux.denx.de>
Fri, 20 Oct 2006 21:04:42 +0000 (23:04 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Fri, 20 Oct 2006 21:04:42 +0000 (23:04 +0200)

Trivial merge