Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:02:48 +0000 (22:02 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:02:48 +0000 (22:02 +0100)

Trivial merge