tree 4ec4db99819be3b1eef0e151b16e634a3efcf2dd
parent bc411b8a643825b634916f9ba167546a88a0ac28
parent 2754c447b7a72599f309ab97aa38a4707f054b6f
parent ee8b09cd60bfe45d856e7c3bef8742835686bf4e
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389920388 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389920388 +0100

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