Merge branch 'next'

author Tom Rini <trini@ti.com>

Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)

committer Tom Rini <trini@ti.com>

Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)
author Tom Rini <trini@ti.com>
Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)
committer Tom Rini <trini@ti.com>
Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)
diff --cc README
Simple merge
diff --cc common/Makefile
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)
committer	Tom Rini <trini@ti.com>
	Thu, 17 Apr 2014 18:33:25 +0000 (14:33 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history