Merge git://git.denx.de/u-boot-fdt

author Tom Rini <[email protected]>

Tue, 25 Nov 2014 16:08:52 +0000 (11:08 -0500)

committer Tom Rini <[email protected]>

Wed, 26 Nov 2014 16:21:14 +0000 (11:21 -0500)
author Tom Rini <[email protected]>
Tue, 25 Nov 2014 16:08:52 +0000 (11:08 -0500)
committer Tom Rini <[email protected]>
Wed, 26 Nov 2014 16:21:14 +0000 (11:21 -0500)
diff --cc README
Simple merge
diff --cc board/compulab/cm_fx6/cm_fx6.c
Simple merge
diff --cc board/tqc/tqma6/tqma6.c
Simple merge
diff --cc common/fdt_support.c
Simple merge
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <[email protected]>
	Tue, 25 Nov 2014 16:08:52 +0000 (11:08 -0500)
committer	Tom Rini <[email protected]>
	Wed, 26 Nov 2014 16:21:14 +0000 (11:21 -0500)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
board/compulab/cm_fx6/cm_fx6.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/tqc/tqma6/tqma6.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/fdt_support.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history