]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branches 'pm-core', 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap' into...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Apr 2021 13:03:23 +0000 (15:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Apr 2021 13:03:23 +0000 (15:03 +0200)
commit538b23aa82b3490a63280a8419420859d6b2352b
tree36d3c77c67e2476f354e3586e00552bb5d08b680
parent8bb46cd2b84bf1b23750842b4b4269779420c46e
parent2c412337cfe655bcc6adff8904fc653a1678f70f
parent4514d991d99211f225d83b7e640285f29f0755d0
parente4b2897ae1a81cce79a8f5fcceda74c3f31c4b73
parentc1df456d0f06eb9275c1cd4c66548fc5738ea428
parent35eb1f5033cf301bda48a22f2edcaed2fda70bfd
Merge branches 'pm-core', 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap' into linux-next

* pm-core:
  PM: runtime: Add documentation for pm_runtime_resume_and_get()
  PM: runtime: Replace inline function pm_runtime_callbacks_present()
  PM: core: Remove duplicate declaration from header file

* pm-pci:
  PCI: PM: Do not read power state in pci_enable_device_flags()

* pm-sleep:
  PM: sleep: fix typos in comments
  freezer: Remove unused inline function try_to_freeze_nowarn()

* pm-domains:
  PM: domains: Don't runtime resume devices at genpd_prepare()

* powercap:
  powercap: RAPL: Fix struct declaration in header file
  MAINTAINERS: Add DTPM subsystem maintainer
  powercap: Add Hygon Fam18h RAPL support
MAINTAINERS