Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Mon, 12 Oct 2009 21:40:27 +0000 (23:40 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 12 Oct 2009 21:40:27 +0000 (23:40 +0200)

Trivial merge