Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 7 Oct 2014 10:11:32 +0000 (12:11 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 7 Oct 2014 10:11:32 +0000 (12:11 +0200)

Trivial merge