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

author Tom Rini <trini@ti.com>

Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)

committer Tom Rini <trini@ti.com>

Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
author Tom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
committer Tom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
committer	Tom Rini <trini@ti.com>
	Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history