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)
commitea33fb1a32e8e3f408b311823cabbb7453148f80
treea81f26a32a32e33c2a25a82423d0bcc8ad48973a
parent61bdb9133593f0f881a57232039296f64bd662ed
parentbfbfab94fd0b38ca780e6dda99657b0c848c9bb9
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'