| commit | 63ef41811b86432101b4627ff07c9671f93a483f | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Mon Aug 12 15:07:03 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Mon Aug 12 15:07:03 2013 -0600 |
| tree | dc34a1b936e6e859d9ab514fc255955acaa2e85f | |
| parent | df99d6a4e9a334a90980d752608ddf5a5fb59719 [diff] | |
| parent | 4d708ab0c88512a3bea12f1ad68539fbe0d11d1a [diff] |
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()