Merge branch 'pci/doc'

author Bjorn Helgaas <[email protected]>

Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)

committer Bjorn Helgaas <[email protected]>

Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)
author Bjorn Helgaas <[email protected]>
Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)
committer Bjorn Helgaas <[email protected]>
Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)
diff --cc drivers/pci/ats.c
Simple merge
diff --cc drivers/pci/of.c
Simple merge
diff --cc drivers/pci/setup-bus.c
Simple merge
author	Bjorn Helgaas <[email protected]>
	Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)
committer	Bjorn Helgaas <[email protected]>
	Wed, 5 Aug 2020 23:24:22 +0000 (18:24 -0500)
		1	2
drivers/pci/ats.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/of.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/setup-bus.c	patch \|	diff1 \|	diff2 \|	blob \| history