Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Mon, 25 Oct 2010 06:06:52 +0000 (08:06 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 25 Oct 2010 06:06:52 +0000 (08:06 +0200)

Trivial merge