Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 19:30:05 +0000 (21:30 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 19:30:05 +0000 (21:30 +0200)

Trivial merge