From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sun, 27 Jan 2013 00:27:36 +0000 (-0700)
Subject: Merge branch 'pci/yijing-ari' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=14b5cb37cc6172a54ce920c61784f44422ae306d;p=deliverable%2Flinux.git

Merge branch 'pci/yijing-ari' into next

* pci/yijing-ari:
  PCI: shpchp: Iterate over all devices in slot, not functions 0-7
  PCI: sgihp: Iterate over all devices in slot, not functions 0-7
  PCI: cpcihp: Iterate over all devices in slot, not functions 0-7
  PCI: pciehp: Iterate over all devices in slot, not functions 0-7
  PCI: Consolidate "next-function" functions
  PCI: Rename pci_enable_ari() to pci_configure_ari()
  PCI: Enable ARI if dev and upstream bridge support it; disable otherwise
---

14b5cb37cc6172a54ce920c61784f44422ae306d