Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
1  2 
Makefile
boards.cfg

diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge