Merge git://git.denx.de/u-boot-dm

author Tom Rini <trini@konsulko.com>

Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)

committer Tom Rini <trini@konsulko.com>

Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)
author Tom Rini <trini@konsulko.com>
Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)
committer Tom Rini <trini@konsulko.com>
Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)
diff --cc README
Simple merge
diff --cc common/board_r.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)
committer	Tom Rini <trini@konsulko.com>
	Tue, 27 Oct 2015 23:08:19 +0000 (19:08 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/board_r.c	patch \|	diff1 \|	diff2 \|	blob \| history