commit | 35e7f73c32ad44a931d918d04e317a7fb0c63e6e | [log] [tgz] |
---|---|---|
author | Bjorn Helgaas <bhelgaas@google.com> | Sat Jun 23 11:59:43 2012 -0600 |
committer | Bjorn Helgaas <bhelgaas@google.com> | Sat Jun 23 11:59:43 2012 -0600 |
tree | e3cb8c89c8230aaa45a0f1b101decdc3b9831938 | |
parent | e5028b52e46eb1379d78d136bd0890705f331183 [diff] | |
parent | 448bd857d48e69b33ef323739dc6d8ca20d4cda7 [diff] |
Merge branch 'topic/huang-d3cold-v7' into next * 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