Merge branch 'pci/yijing-pci_is_pcie-v2' into next

* pci/yijing-pci_is_pcie-v2:
  powerpc/pci: Use pci_is_pcie() to simplify code [fix]
This commit is contained in:
Bjorn Helgaas 2013-11-04 17:01:27 -07:00
commit 589a1b076f