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

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

Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)

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

Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc common/spl/spl.c
Simple merge
diff --cc include/configs/omap5_uevm.h
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
common/spl/spl.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap5_uevm.h	patch \|	diff1 \|	diff2 \|	blob \| history