diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-30 18:07:05 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-30 18:07:05 +0200 |
commit | 4a577fca503a63442928ff4cec06c1136ea9b53e (patch) | |
tree | a09ff03d79aa70bb5a3fb2e3decb6199b9b65d98 /fs/bfs | |
parent | 15f4bb9aac620f7ca1e50c859731e7d990f807ed (diff) | |
parent | 185d20694a8aceb4eda9fc1314cbaad0df0aab07 (diff) | |
parent | 1934fee67593c561ef883761bf2ddee82f908ed9 (diff) | |
parent | 4c19851c70bae39e85979a72954982891a72e1c2 (diff) | |
download | linux-4a577fca503a63442928ff4cec06c1136ea9b53e.tar.bz2 |
Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'
Merge ACPI battery and backlight driver update and miscellaneous
cleanup for 5.19-rc1:
- Make the ACPI battery driver show the "not-charging" status by
default unless "charging" or "full" is directly indicated (Werner
Sembach).
- Improve the PM notifier in the ACPI backlight driver (Zhang Rui).
- Clean up some white space in the ACPI code (Ian Cowan).
* acpi-battery:
ACPI: battery: Make "not-charging" the default on no charging or full info
* acpi-video:
ACPI: video: improve PM notifer callback
* acpi-misc:
ACPI: clean up white space in a few places for consistency