Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Sun, 29 Apr 2007 14:40:31 +0000 (16:40 +0200)
committerStefan Roese <sr@denx.de>
Sun, 29 Apr 2007 14:40:31 +0000 (16:40 +0200)

Trivial merge