Merge remote-tracking branch 'usb/usb-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)
diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge
diff --cc arch/arm64/boot/dts/freescale/imx8mp.dtsi
Simple merge
diff --cc include/linux/power_supply.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 06:47:31 +0000 (16:47 +1000)
		1	2
arch/arm/configs/multi_v7_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/freescale/imx8mp.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/power_supply.h	patch \|	diff1 \|	diff2 \|	blob \| history