diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 16:57:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 16:57:17 +0200 |
| commit | bf0cc8360e6bc27989cf4d29ba390a8eb250205f (patch) | |
| tree | 974d100b9e93c48cb3badc083f06c570f7693cc9 /drivers/base | |
| parent | dd9f2ae92481ef9454e3fdce9d78f790c49cfadd (diff) | |
| parent | 2c412337cfe655bcc6adff8904fc653a1678f70f (diff) | |
| parent | 4514d991d99211f225d83b7e640285f29f0755d0 (diff) | |
| parent | e48802333acecfa3ada7b13eb55fa03b08df9e74 (diff) | |
| parent | c1df456d0f06eb9275c1cd4c66548fc5738ea428 (diff) | |
| parent | 35eb1f5033cf301bda48a22f2edcaed2fda70bfd (diff) | |
Merge branches 'pm-core', 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap'
* 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: wakeup: remove redundant assignment to variable retval
PM: hibernate: x86: Use crc32 instead of md5 for hibernation e820 integrity check
PM: wakeup: use dev_set_name() directly
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