Merge remote branch 'u-boot-mips/master'
authorWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:11:40 +0000 (00:11 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:11:40 +0000 (00:11 +0200)

Trivial merge