Merge branch 'pci/trivial'

  - Fix typos and whitespace errors (Bjorn Helgaas)

* pci/trivial:
  PCI: Fix typos and whitespace errors

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

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

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

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

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