Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jul 2008 23:24:07 +0000 (01:24 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jul 2008 23:24:07 +0000 (01:24 +0200)

Trivial merge