]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'pci/vipul-chelsio-reset-v2' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Aug 2013 21:07:03 +0000 (15:07 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Aug 2013 21:07:03 +0000 (15:07 -0600)
commit63ef41811b86432101b4627ff07c9671f93a483f
treedc34a1b936e6e859d9ab514fc255955acaa2e85f
parentdf99d6a4e9a334a90980d752608ddf5a5fb59719
parent4d708ab0c88512a3bea12f1ad68539fbe0d11d1a
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()
drivers/pci/pci.c
drivers/pci/quirks.c