]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-tools' and 'pm-tools' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 May 2014 15:41:55 +0000 (17:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 May 2014 15:41:55 +0000 (17:41 +0200)
* acpi-tools:
  ACPI / tools: Introduce ec_access.c - tool to access the EC

* pm-tools:
  PM / tools: cpupower: add option to display values without round offs
  tools / power: turbostat: Drop temperature checks


Trivial merge