aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi/osd_protocol.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-17 12:43:16 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-04-17 12:43:16 -0400
commit42c34707f9d24ef159cce87e4353babcf2b417a6 (patch)
treed7f94610311cd59885b8bcfec6d36bde93ccf22d /include/scsi/osd_protocol.h
parent723ec4d06cb2eed481436cfe008f5f63c45e88fd (diff)
parentffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 (diff)
Merge branch 'pci/rafael-pm' into next
* pci/rafael-pm: PCI/PM: Make pci_pme_active() ignore devices without PME support PCI/PM: Fix fallback to PCI_D0 in pci_platform_power_transition()
Diffstat (limited to 'include/scsi/osd_protocol.h')
0 files changed, 0 insertions, 0 deletions