aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:52 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:52 +0100
commit92266e1de4324a23359fe71678cb521987fea0c5 (patch)
tree329dea9cbe250fd361e40207c351be044afe0775
parent4c170ed1d9d66464361cb47853ffb9fa64ca5048 (diff)
parent76fc35ddf8c075aa0e3f52384591d613b906ebb6 (diff)
parent4295733eee4e69eda432d95765b7762dc6013271 (diff)
downloadlinux-aarch64-92266e1de4324a23359fe71678cb521987fea0c5.tar.gz
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