From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 17 Jan 2014 00:59:48 +0000 (+0100)
Subject: Merge branches 'acpi-tools' and 'pm-tools'
X-Git-Tag: v3.14-rc1~107^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=df34ca72ed7a3cd55a497834940d4551fac67bdb;p=linux.git

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
---

df34ca72ed7a3cd55a497834940d4551fac67bdb