Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)

Trivial merge