aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:48 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:48 +0100
commitdf34ca72ed7a3cd55a497834940d4551fac67bdb (patch)
tree4ec4db99819be3b1eef0e151b16e634a3efcf2dd
parentbc411b8a643825b634916f9ba167546a88a0ac28 (diff)
parent2754c447b7a72599f309ab97aa38a4707f054b6f (diff)
parentee8b09cd60bfe45d856e7c3bef8742835686bf4e (diff)
downloadlinux-df34ca72ed7a3cd55a497834940d4551fac67bdb.tar.gz
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