tree 966237e8f11d5fde75062ae9af76f3f133a15967
parent 5550ac6b418e8aaedc0e88f86754ec708ddc9a3a
parent 9f061457fd6b7e2e7e7d75e475498e51747cc695
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1412676692 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1412676692 +0200

Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'