Merge remote-tracking branch 'u-boot-ti/master'

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

Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)

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

Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 3 Nov 2012 09:05:22 +0000 (10:05 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history