Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sun, 13 Jul 2008 12:43:57 +0000 (14:43 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Jul 2008 12:43:57 +0000 (14:43 +0200)

Trivial merge