Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 30 Apr 2008 21:04:51 +0000 (23:04 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 30 Apr 2008 21:04:51 +0000 (23:04 +0200)

Trivial merge