Merge branch 'pci/rafael-pm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 17 Apr 2013 16:43:16 +0000 (10:43 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 17 Apr 2013 16:43:16 +0000 (10:43 -0600)
commit42c34707f9d24ef159cce87e4353babcf2b417a6
treed7f94610311cd59885b8bcfec6d36bde93ccf22d
parent723ec4d06cb2eed481436cfe008f5f63c45e88fd
parentffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59
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()
drivers/pci/pci.c