Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 10 Jul 2013 18:40:47 +0000 (20:40 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 10 Jul 2013 18:40:47 +0000 (20:40 +0200)

Trivial merge