Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df34ca72 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-tools' and 'pm-tools' 

* acpi-tools:
  ACPICA: acpidump: Update MAINTAINERS file to include tools folder for ACPI/ACPICA.
  ACPICA: acpidump: Enable tools Makefile to include acpi tools.
  ACPICA: acpidump: Cleanup tools/power/acpi makefiles.

* pm-tools:
  PM / tools: new tool for suspend/resume performance optimization
  cpupower: Fix sscanf robustness in cpufreq-set
parents bc411b8a 2754c447 ee8b09cd

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ F: Documentation/ABI/testing/sysfs-bus-acpi 
F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*

F:	tools/power/acpi



ACPI COMPONENT ARCHITECTURE (ACPICA)

M:	Robert Moore <robert.moore@intel.com>
@@ -266,6 +267,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 
S:	Supported

F:	drivers/acpi/acpica/

F:	include/acpi/

F:	tools/power/acpi/



ACPI FAN DRIVER

M:	Zhang Rui <rui.zhang@intel.com>