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

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

Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)

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

Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/host/xhci-mem.c
Simple merge
diff --cc drivers/usb/host/xhci.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Oct 2020 01:18:26 +0000 (12:18 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-mem.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	patch \|	diff1 \|	diff2 \|	blob \| history