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

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

Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)

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

Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 26 Mar 2013 09:40:13 +0000 (10:40 +0100)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history