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)
* 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()

1  2 
drivers/pci/pci.c

Simple merge