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

author Tom Rini <[email protected]>

Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)

committer Tom Rini <[email protected]>

Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)
author Tom Rini <[email protected]>
Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)
committer Tom Rini <[email protected]>
Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)
diff --cc arch/sandbox/dts/test.dts
Simple merge
diff --cc board/sunxi/board.c
Simple merge
diff --cc include/dm/uclass-id.h
Simple merge
author	Tom Rini <[email protected]>
	Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)
committer	Tom Rini <[email protected]>
	Mon, 10 Dec 2018 12:15:12 +0000 (07:15 -0500)
		1	2
arch/sandbox/dts/test.dts	patch \|	diff1 \|	diff2 \|	blob \| history
board/sunxi/board.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/dm/uclass-id.h	patch \|	diff1 \|	diff2 \|	blob \| history