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

Trivial merge