Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 30 Jun 2010 08:10:32 +0000 (10:10 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 30 Jun 2010 08:10:32 +0000 (10:10 +0200)

Trivial merge