diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-15 18:53:35 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-15 18:53:35 +0100 |
commit | 6e2d98dc1af49a6736cd9c54e2e44b5d5234d242 (patch) | |
tree | f17178aad8cc3e721c8da14ad439379a03a488ef /drivers/video/arkfb.c | |
parent | Merge branch 'pci/locking' into next (diff) | |
parent | vfio-pci: Use pci "try" reset interface (diff) | |
download | linux-6e2d98dc1af49a6736cd9c54e2e44b5d5234d242.tar.xz linux-6e2d98dc1af49a6736cd9c54e2e44b5d5234d242.zip |
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()
Diffstat (limited to 'drivers/video/arkfb.c')
0 files changed, 0 insertions, 0 deletions