]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4030461 890ed57)
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)
* pci/reset:
  vfio-pci: Use pci "try" reset interface
  PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()

1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
include/linux/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
XArray, radix tree and IDR