tree cf99998722135c5c74584c390bfce73a7c954e4b
parent 790af815436bc6a93e4c581840be2419897f23b1
parent 5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1412983255 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1412983255 +0200

Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into 'u-boot-arm/master'