Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:55:06 +0000 (21:55 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:55:06 +0000 (21:55 +0200)

Trivial merge