From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 24 Sep 2013 00:00:08 +0000 (-0600)
Subject: Merge branch 'pci/yijing-pci_is_pcie-v2' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63495fff27dfa0ce89ceb8f6350976e822398c5c;p=linux-beck.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
  [SCSI] qla2xxx: Use pcie_is_pcie() to simplify code
  [SCSI] csiostor: Use pcie_capability_clear_and_set_word() to simplify code
  [SCSI] bfa: Use pcie_set()/get_readrq() to simplify code
  x86/pci: Use cached pci_dev->pcie_cap to simplify code
  PCI: Use pci_is_pcie() to simplify code
---

63495fff27dfa0ce89ceb8f6350976e822398c5c