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

Trivial merge