tree 329dea9cbe250fd361e40207c351be044afe0775
parent 4c170ed1d9d66464361cb47853ffb9fa64ca5048
parent 76fc35ddf8c075aa0e3f52384591d613b906ebb6
parent 4295733eee4e69eda432d95765b7762dc6013271
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557452 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557452 +0100

Merge branches 'pm-pci' and 'pm-core'

* pm-pci:
  PCI / PM: Fix small typo in documentation
  PCI / PM: constify pci_platform_pm_ops structure

* pm-core:
  PM / core: fix typo in documentation
  PM / runtime: Add new helper for conditional usage count incrementation
  MAINTAINERS: Add an entry for the PM core
  PM / runtime: Re-init runtime PM states at probe error and driver unbind
  PM / sleep: prohibit devices probing during suspend/hibernation