Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 23:19:13 +0000 (00:19 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 23:19:13 +0000 (00:19 +0100)

Trivial merge