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

author Tom Rini <trini@ti.com>

Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)

committer Tom Rini <trini@ti.com>

Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)
author Tom Rini <trini@ti.com>
Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)
committer Tom Rini <trini@ti.com>
Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 1 Dec 2014 20:24:26 +0000 (15:24 -0500)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history