]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branches 'acpi-tools' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:59:48 +0000 (01:59 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:59:48 +0000 (01:59 +0100)
commitdf34ca72ed7a3cd55a497834940d4551fac67bdb
tree4ec4db99819be3b1eef0e151b16e634a3efcf2dd
parentbc411b8a643825b634916f9ba167546a88a0ac28
parent2754c447b7a72599f309ab97aa38a4707f054b6f
parentee8b09cd60bfe45d856e7c3bef8742835686bf4e
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