Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 21 Apr 2014 19:01:35 +0000 (21:01 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history