Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 8 Sep 2014 22:21:24 +0000 (00:21 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 8 Sep 2014 22:21:24 +0000 (00:21 +0200)

Trivial merge