Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:34:29 +0000 (20:34 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:34:29 +0000 (20:34 +0200)

Trivial merge