Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 9 Jan 2013 15:57:03 +0000 (16:57 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 9 Jan 2013 15:57:03 +0000 (16:57 +0100)

Trivial merge