]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 18:13:48 +0000 (20:13 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 18:13:48 +0000 (20:13 +0200)

Trivial merge