Merge branch 'master' of git://www.denx.de/git/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)

Trivial merge