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

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

Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)

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

Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
diff --cc arch/arm/cpu/armv7/omap3/board.c
Simple merge
diff --cc board/ait/cam_enc_4xx/cam_enc_4xx.c
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
		1	2
arch/arm/cpu/armv7/omap3/board.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/ait/cam_enc_4xx/cam_enc_4xx.c	patch \|	diff1 \|	diff2 \|	blob \| history