Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:04:48 +0000 (01:04 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:04:48 +0000 (01:04 +0200)

Trivial merge