]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 25 Jun 2014 08:39:58 +0000 (10:39 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 25 Jun 2014 08:39:58 +0000 (10:39 +0200)

Trivial merge