Merge branch 'topic/huang-d3cold-v7' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 23 Jun 2012 17:59:43 +0000 (11:59 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 23 Jun 2012 17:59:43 +0000 (11:59 -0600)
* topic/huang-d3cold-v7:
  PCI/PM: add PCIe runtime D3cold support
  PCI: do not call pci_set_power_state with PCI_D3cold
  PCI/PM: add runtime PM support to PCIe port
  ACPI/PM: specify lowest allowed state for device sleep state


Trivial merge