Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Fri, 12 Dec 2008 23:34:12 +0000 (00:34 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Dec 2008 23:34:12 +0000 (00:34 +0100)

Trivial merge