]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87c83ba dc0dfb9 ae7d65b)
Merge branches 'pm-pci' and 'pm-core'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:52 +0000 (01:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:52 +0000 (01:10 +0100)
commita6695a55bafe304ba7ad18e2071c91fe9ac72909
tree329dea9cbe250fd361e40207c351be044afe0775tree | snapshot
parent87c83ba24222df059fb04ce566d1acfcca8c5455commit | diff
parentdc0dfb9ac4e6f5018a993de0a01499f9e89f0ee6commit | diff
parentae7d65b6eac05ddd853e7980c246993e0d2442e8commit | diff
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
MAINTAINERS diff1 | diff2 | diff3 | blob | history
drivers/base/dd.c diff1 | diff2 | diff3 | blob | history
Linux Kernel Source Tree.