Merge with /home/sr/git/u-boot/denx-merge-sr
authorWolfgang Denk <wd@pollux.denx.de>
Sat, 13 Jan 2007 10:25:08 +0000 (11:25 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Jan 2007 10:25:08 +0000 (11:25 +0100)

Trivial merge