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

author Tom Rini <trini@ti.com>

Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)

committer Tom Rini <trini@ti.com>

Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)
author Tom Rini <trini@ti.com>
Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)
committer Tom Rini <trini@ti.com>
Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)
diff --cc README
Simple merge
diff --cc include/image.h
Simple merge
diff --cc tools/Makefile
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)
committer	Tom Rini <trini@ti.com>
	Fri, 30 Jan 2015 14:24:42 +0000 (09:24 -0500)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/image.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history