Merge branch 'pci/trivial'

  - Fix typos and whitespace errors (Bjorn Helgaas, Krzysztof Wilczynski)

  - Remove unnecessary "return" statements (Krzysztof Wilczynski)

  - Correct of_irq_parse_pci() function documentation (Lubomir Rintel)

* pci/trivial:
  PCI: Remove unnecessary returns
  PCI: OF: Correct of_irq_parse_pci() documentation
  PCI: Fix typos and whitespace errors

diff --cc drivers/pci/Kconfig
Simple merge

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

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

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