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)
commit35e7f73c32ad44a931d918d04e317a7fb0c63e6e
treee3cb8c89c8230aaa45a0f1b101decdc3b9831938
parente5028b52e46eb1379d78d136bd0890705f331183
parent448bd857d48e69b33ef323739dc6d8ca20d4cda7
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
drivers/pci/pci-acpi.c
drivers/pci/pci-sysfs.c
drivers/pci/pci.c
drivers/pci/pci.h
include/acpi/acpi_bus.h
include/linux/pci.h