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

Trivial merge