Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 14 Jan 2013 14:21:00 +0000 (15:21 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 14 Jan 2013 14:21:00 +0000 (15:21 +0100)

Trivial merge