projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c170ed 76fc35d 4295733)
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)
commit92266e1de4324a23359fe71678cb521987fea0c5
tree329dea9cbe250fd361e40207c351be044afe0775tree | snapshot (tar.gz zip)
parent4c170ed1d9d66464361cb47853ffb9fa64ca5048commit | diff
parent76fc35ddf8c075aa0e3f52384591d613b906ebb6commit | diff
parent4295733eee4e69eda432d95765b7762dc6013271commit | 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