Merge branch 'pci/trivial' into next

* pci/trivial:
  PCI: Fix typos and whitespace errors
  PCI: Remove unused "res" variable from pci_resource_io()
  PCI: Correct kernel-doc of pci_vpd_srdt_size(), pci_vpd_srdt_tag()

diff --cc Documentation/devicetree/bindings/pci/layerscape-pci.txt
index ebf3feffed8ab81043939138a4e7bfda968dc196,e00c706f85d9c8ad5c908764901ea609073ed6be..c0484da0f20d9d87f3be44f9bfd844362820bb59
--- 1/Documentation/devicetree/bindings/pci/layerscape-pci.txt
--- 2/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@@ -15,10 -15,8 +15,10 @@@ Required properties
  - compatible: should contain the platform identifier such as:
          "fsl,ls1021a-pcie", "snps,dw-pcie"
          "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
 +        "fsl,ls2088a-pcie"
 +        "fsl,ls1088a-pcie"
          "fsl,ls1046a-pcie"
- - reg: base addresses and lengths of the PCIe controller
+ - reg: base addresses and lengths of the PCIe controller register blocks.
  - interrupts: A list of interrupt outputs of the controller. Must contain an
    entry for each entry in the interrupt-names property.
  - interrupt-names: Must include the following entries:

diff --cc Documentation/devicetree/bindings/pci/qcom,pcie.txt
Simple merge

diff --cc Documentation/devicetree/bindings/pci/rockchip-pcie.txt
index 5678be82530d80fa647eb16317ac94e34366c0e2,1136e928210813e99e01396adfb7b5639970462c..af34c65773fd7fc540411b06be96011cc84828d1
--- 1/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
--- 2/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
@@@ -55,9 -45,8 +55,9 @@@ Required properties for per-lane PHY mo
  Optional Property:
  - aspm-no-l0s: RC won't support ASPM L0s. This property is needed if
        using 24MHz OSC for RC's PHY.
- - ep-gpios: contain the entry for pre-reset gpio
+ - ep-gpios: contain the entry for pre-reset GPIO
  - num-lanes: number of lanes to use
 +- vpcie12v-supply: The phandle to the 12v regulator to use for PCIe.
  - vpcie3v3-supply: The phandle to the 3.3v regulator to use for PCIe.
  - vpcie1v8-supply: The phandle to the 1.8v regulator to use for PCIe.
  - vpcie0v9-supply: The phandle to the 0.9v regulator to use for PCIe.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/dwc/pci-dra7xx.c
Simple merge

diff --cc drivers/pci/dwc/pci-keystone-dw.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware-ep.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware-host.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware.h
Simple merge

diff --cc drivers/pci/host/pcie-rockchip.c
Simple merge

diff --cc drivers/pci/host/pcie-xilinx.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc include/linux/pci.h
Simple merge

diff --cc include/linux/pcieport_if.h
Simple merge