]> 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>
Fri, 6 Dec 2013 13:26:51 +0000 (14:26 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 6 Dec 2013 13:26:51 +0000 (14:26 +0100)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge