From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 5 Nov 2013 00:01:27 +0000 (-0700)
Subject: Merge branch 'pci/yijing-pci_is_pcie-v2' into next
X-Git-Tag: v3.13-rc1~95^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=589a1b076ff9b6f84184507ec303229b3df20658;p=linux.git

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]
---

589a1b076ff9b6f84184507ec303229b3df20658