Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
authorStefan Roese <sr@denx.de>
Tue, 16 Jan 2007 14:49:14 +0000 (15:49 +0100)
committerStefan Roese <sr@denx.de>
Tue, 16 Jan 2007 14:49:14 +0000 (15:49 +0100)

Trivial merge