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

author Albert ARIBAUD <[email protected]>

Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)

committer Albert ARIBAUD <[email protected]>

Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)
author Albert ARIBAUD <[email protected]>
Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)
committer Albert ARIBAUD <[email protected]>
Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)
diff --cc include/configs/mx28evk.h
Simple merge
diff --cc spl/Makefile
Simple merge
author	Albert ARIBAUD <[email protected]>
	Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)
committer	Albert ARIBAUD <[email protected]>
	Fri, 26 Oct 2012 05:00:28 +0000 (07:00 +0200)
		1	2
include/configs/mx28evk.h	patch \|	diff1 \|	diff2 \|	blob \| history
spl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history