Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 6 Dec 2013 15:54:42 +0000 (16:54 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 6 Dec 2013 15:54:42 +0000 (16:54 +0100)

Trivial merge