Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 11:15:20 +0000 (13:15 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 11:15:20 +0000 (13:15 +0200)

Trivial merge