Merge branch 'master' of git+ssh://gemini_vpn/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 16 Oct 2007 14:45:20 +0000 (16:45 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 16 Oct 2007 14:45:20 +0000 (16:45 +0200)

Trivial merge