]> 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, 11 Jan 2013 17:17:33 +0000 (18:17 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 11 Jan 2013 17:17:33 +0000 (18:17 +0100)
1  2 
README

diff --cc README
Simple merge