Merge branch 'master' of git://www.denx.de/git/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Sun, 18 Nov 2007 00:26:14 +0000 (01:26 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 18 Nov 2007 00:26:14 +0000 (01:26 +0100)

Trivial merge