]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:30 +0000 (01:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:30 +0000 (01:20 +0200)

Trivial merge