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

Trivial merge