From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:10:52 +0000 (+0100)
Subject: Merge branches 'pm-pci' and 'pm-core'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=92266e1de4324a23359fe71678cb521987fea0c5;p=linux.git

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

92266e1de4324a23359fe71678cb521987fea0c5