diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:55:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:55:19 +0200 |
| commit | 7afc53951a2b81601d6dcfbde8e3c946422bbbe0 (patch) | |
| tree | e37476fe774a9865594339dd2096d32c04a17ba4 /include/uapi | |
| parent | 78baa1ea5880f2d336d2ad92724988584d2f471d (diff) | |
| parent | fc1860d6b17fa00d16df5e608eed0526e11ccad1 (diff) | |
| parent | 4302e381a870aafb547e6139830e5a4ee2cb8261 (diff) | |
| download | linux-7afc53951a2b81601d6dcfbde8e3c946422bbbe0.tar.bz2 | |
Merge branches 'pm-docs' and 'pm-misc'
* pm-docs:
Documentation: PM: Unify copyright notices
Documentation: PM: Add SPDX license tags to multiple files
cpufreq: intel_pstate: Documentation: Add references sections
* pm-misc:
firmware/psci: add support for SYSTEM_RESET2
drivers: firmware: psci: Announce support for OS initiated suspend mode
drivers: firmware: psci: Simplify error path of psci_dt_init()
drivers: firmware: psci: Split psci_dt_cpu_init_idle()
MAINTAINERS: Update files for PSCI
drivers: firmware: psci: Move psci to separate directory