Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 9 Sep 2014 07:19:10 +0000 (09:19 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 9 Sep 2014 07:19:10 +0000 (09:19 +0200)

Trivial merge