diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 21:00:57 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 21:00:57 +0100 |
commit | d3fe3988fb24e5ed13b2243b789a652882d3b26c (patch) | |
tree | 1257424a712583bf474cb0831621a47e73dfc3de /Documentation/pi-futex.txt | |
parent | Merge branch 'pci/misc' into next (diff) | |
parent | PCI/portdrv: Don't create hotplug slots unless port supports hotplug (diff) | |
download | linux-d3fe3988fb24e5ed13b2243b789a652882d3b26c.tar.xz linux-d3fe3988fb24e5ed13b2243b789a652882d3b26c.zip |
Merge branch 'for-linus' into next
* for-linus:
PCI/portdrv: Don't create hotplug slots unless port supports hotplug
PCI/PM: Fix proc config reg access for D3cold and bridge suspending
PCI/PM: Resume device before shutdown
PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Diffstat (limited to 'Documentation/pi-futex.txt')
0 files changed, 0 insertions, 0 deletions