Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 11:16:34 +0000 (13:16 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 11:16:34 +0000 (13:16 +0200)

Trivial merge