Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Mon, 28 Apr 2008 10:07:34 +0000 (12:07 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 28 Apr 2008 10:07:34 +0000 (12:07 +0200)

Trivial merge