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

author Tom Rini <trini@ti.com>

Tue, 25 Nov 2014 16:09:48 +0000 (11:09 -0500)

committer Tom Rini <trini@ti.com>

Wed, 26 Nov 2014 16:21:16 +0000 (11:21 -0500)
author Tom Rini <trini@ti.com>
Tue, 25 Nov 2014 16:09:48 +0000 (11:09 -0500)
committer Tom Rini <trini@ti.com>
Wed, 26 Nov 2014 16:21:16 +0000 (11:21 -0500)
diff --cc common/fdt_support.c
Simple merge
diff --cc include/fdt_support.h
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 25 Nov 2014 16:09:48 +0000 (11:09 -0500)
committer	Tom Rini <trini@ti.com>
	Wed, 26 Nov 2014 16:21:16 +0000 (11:21 -0500)
		1	2
common/fdt_support.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/fdt_support.h	patch \|	diff1 \|	diff2 \|	blob \| history