From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 12 Aug 2013 21:07:03 +0000 (-0600)
Subject: Merge branch 'pci/vipul-chelsio-reset-v2' into next
X-Git-Tag: firefly_0821_release~176^2~5465^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63ef41811b86432101b4627ff07c9671f93a483f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/vipul-chelsio-reset-v2' into next

* pci/vipul-chelsio-reset-v2:
  PCI: Use pci_wait_for_pending_transaction() instead of for loop
  bnx2x: Use pci_wait_for_pending_transaction() instead of for loop
  PCI: Chelsio quirk: Enable Bus Master during Function-Level Reset
  PCI: Add pci_wait_for_pending_transaction()
---

63ef41811b86432101b4627ff07c9671f93a483f