Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 20:15:25 +0000 (21:15 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 20:15:25 +0000 (21:15 +0100)

Trivial merge