Merge remote-tracking branch 'devicetree/for-next'

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

Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)

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

Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 03:52:49 +0000 (13:52 +1000)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history