Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 17:32:26 +0000 (18:32 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 17:32:26 +0000 (18:32 +0100)

Trivial merge