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

author Tom Rini <trini@konsulko.com>

Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)

committer Tom Rini <trini@konsulko.com>

Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)
author Tom Rini <trini@konsulko.com>
Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)
committer Tom Rini <trini@konsulko.com>
Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)
diff --cc drivers/core/ofnode.c
Simple merge
diff --cc include/dm/ofnode.h
Simple merge
diff --cc include/dm/read.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)
committer	Tom Rini <trini@konsulko.com>
	Sat, 29 Jul 2017 15:43:51 +0000 (11:43 -0400)
		1	2
drivers/core/ofnode.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/dm/ofnode.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/dm/read.h	patch \|	diff1 \|	diff2 \|	blob \| history