diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:50:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:50:37 +0200 |
| commit | 8b457d60608aa76d7ce9c04a312669761025ba42 (patch) | |
| tree | af119fba5f47e1fe4a6c77b27abf538a5fbfaf3c /drivers/acpi/sleep.c | |
| parent | 3a616ec7977b3576caf8214cf92cac646f41cd55 (diff) | |
| parent | 7d966119f7db5b0bbba61ec3376dad48567aecae (diff) | |
| parent | 0ac2c0e4ff4b41693977ebf624ba5952344cd7ac (diff) | |
Merge branches 'acpi-dptf' and 'acpi-messages'
* acpi-dptf:
ACPI: DPTF: Add battery participant for Intel SoCs
* acpi-messages:
ACPI: Remove the macro PREFIX "ACPI: "
ACPI: sleep: Unify the message printing
ACPI: sbs: Unify the message printing
ACPI: scan: Unify the log message printing
ACPI: sbshc: Unify the message printing
ACPI: sysfs: Cleanup message printing
ACPI: reboot: Unify the message printing
ACPI: processor_throttling: Cleanup the printing messages
ACPI: processor_perflib: Cleanup print messages
ACPI: processor_thermal: Remove unused PREFIX for printing
ACPI: pci_root: Unify the message printing
ACPI: osl: Remove the duplicated PREFIX for message printing
ACPI: nvs: Unify the message printing
ACPI: glue: Clean up the printing messages
ACPI: event: Use pr_*() macros to replace printk()
ACPI: bus: Use pr_*() macros to replace printk()
ACPI: blacklist: Unify the message printing
ACPI: cmos_rtc: Using pr_fmt() and remove PREFIX