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

author Tom Rini <trini@ti.com>

Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)

committer Tom Rini <trini@ti.com>

Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)
author Tom Rini <trini@ti.com>
Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)
committer Tom Rini <trini@ti.com>
Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)
diff --cc Makefile
Simple merge
diff --cc include/configs/exynos5250-dt.h
Simple merge
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/Makefile
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)
committer	Tom Rini <trini@ti.com>
	Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/exynos5250-dt.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history