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

author Tom Rini <trini@ti.com>

Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)

committer Tom Rini <trini@ti.com>

Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
author Tom Rini <trini@ti.com>
Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
committer Tom Rini <trini@ti.com>
Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
diff --cc common/board_r.c
Simple merge
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
committer	Tom Rini <trini@ti.com>
	Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
		1	2
common/board_r.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history