Merge branch 'master' of git://git.denx.de/u-boot-x86

author Tom Rini <trini@konsulko.com>

Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)

committer Tom Rini <trini@konsulko.com>

Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
author Tom Rini <trini@konsulko.com>
Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
committer Tom Rini <trini@konsulko.com>
Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
committer	Tom Rini <trini@konsulko.com>
	Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history