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

author Tom Rini <trini@konsulko.com>

Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)

committer Tom Rini <trini@konsulko.com>

Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)
committer Tom Rini <trini@konsulko.com>
Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)
diff --cc configs/colibri_vf_defconfig
Simple merge
diff --cc drivers/usb/gadget/ether.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)
committer	Tom Rini <trini@konsulko.com>
	Thu, 5 Oct 2017 12:26:36 +0000 (08:26 -0400)
		1	2
configs/colibri_vf_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/ether.c	patch \|	diff1 \|	diff2 \|	blob \| history