Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 16 Dec 2008 16:16:34 +0000 (17:16 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 16 Dec 2008 16:16:34 +0000 (17:16 +0100)

Trivial merge