Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 10 May 2011 20:34:24 +0000 (22:34 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 10 May 2011 20:34:24 +0000 (22:34 +0200)

Trivial merge