Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:17:38 +0000 (12:17 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:17:38 +0000 (12:17 +0200)

Trivial merge