]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)

Trivial merge