Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 20:37:16 +0000 (22:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 20:37:16 +0000 (22:37 +0200)

Trivial merge