Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sat, 18 Dec 2010 22:15:40 +0000 (23:15 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 18 Dec 2010 22:15:40 +0000 (23:15 +0100)

Trivial merge