From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Jan 2014 17:53:35 +0000 (-0700)
Subject: Merge branch 'pci/reset' into next
X-Git-Tag: firefly_0821_release~176^2~4608^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e2d98dc1af49a6736cd9c54e2e44b5d5234d242;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/reset' into next

* pci/reset:
  vfio-pci: Use pci "try" reset interface
  PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()
---

6e2d98dc1af49a6736cd9c54e2e44b5d5234d242