]> 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>
Wed, 8 Jan 2014 19:48:26 +0000 (20:48 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 8 Jan 2014 19:48:26 +0000 (20:48 +0100)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge