Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

author Tom Rini <trini@ti.com>

Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)

committer Tom Rini <trini@ti.com>

Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
author Tom Rini <trini@ti.com>
Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
committer Tom Rini <trini@ti.com>
Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
committer	Tom Rini <trini@ti.com>
	Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history