From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 23 Jun 2012 17:59:43 +0000 (-0600)
Subject: Merge branch 'topic/huang-d3cold-v7' into next
X-Git-Tag: v3.6-rc1~112^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35e7f73c32ad44a931d918d04e317a7fb0c63e6e;p=thirdparty%2Fkernel%2Flinux.git

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
---

35e7f73c32ad44a931d918d04e317a7fb0c63e6e