Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorWolfgang Denk <[email protected]>
Wed, 13 Oct 2010 07:59:13 +0000 (09:59 +0200)
committerWolfgang Denk <[email protected]>
Wed, 13 Oct 2010 07:59:13 +0000 (09:59 +0200)

Trivial merge