Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:43 +0000 (22:50 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:43 +0000 (22:50 +0200)

Trivial merge