Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Sun, 13 Jan 2008 14:59:21 +0000 (15:59 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Jan 2008 14:59:21 +0000 (15:59 +0100)

Trivial merge