Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:59:29 +0000 (22:59 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:59:29 +0000 (22:59 +0200)

Trivial merge