]> Pileus Git - ~andy/linux/commit
Merge branch 'pci/reset' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
commit6e2d98dc1af49a6736cd9c54e2e44b5d5234d242
treef17178aad8cc3e721c8da14ad439379a03a488ef
parent40304618468cae5259f77c15511e4feb7bfb624b
parent890ed578df82f5b7b5a874f9f2fa4f117305df5f
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()
drivers/pci/pci.c
include/linux/pci.h