]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 24 May 2014 07:50:00 +0000 (09:50 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 24 May 2014 07:50:00 +0000 (09:50 +0200)

Trivial merge