diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 10:20:05 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 10:20:05 -0700 |
| commit | 6c52f51ccbb371d9161a1081560df7d31df4c495 (patch) | |
| tree | d7f6a7e989c161840f3f7ea66edc846653e4ea19 /tools/perf/scripts/python/futex-contention.py | |
| parent | fa4378041e6c285399fa1a104d8dd77daae4529f (diff) | |
| parent | 5b764b834ea925b7fc87df4a87a0fde95acbecb9 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Stop clearing bridge Secondary Status when setting up I/O aperture
PCI: Prevent bus conflicts while checking for bridge apertures
PCI: Drop "irq" param from *_restore_msi_irqs()
PCI/portdrv: Remove superfluous name cast
PCI: Clear NumVFs when disabling SR-IOV in sriov_init()
Diffstat (limited to 'tools/perf/scripts/python/futex-contention.py')
0 files changed, 0 insertions, 0 deletions