Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:55 +0000 (01:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:55 +0000 (01:20 +0200)

Trivial merge