diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 12:43:16 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 12:43:16 -0400 |
commit | 42c34707f9d24ef159cce87e4353babcf2b417a6 (patch) | |
tree | d7f94610311cd59885b8bcfec6d36bde93ccf22d /include/linux/vme.h | |
parent | 723ec4d06cb2eed481436cfe008f5f63c45e88fd (diff) | |
parent | ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 (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/linux/vme.h')
0 files changed, 0 insertions, 0 deletions