Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:28:13 +0000 (23:28 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:28:13 +0000 (23:28 +0100)

Trivial merge