Merge branches 'pm-devfreq' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:39 +0000 (01:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:39 +0000 (01:41 +0100)
commit990a848d537e4da966907c8ccec95bc568f2911c
tree09357a2081cd9824cf89ae8260a147a33584ea52
parent1efef68262dc567f0c09da9d11924e8287cd3a8b
parent82a1faa94989d92b65ef137030329b75aaa2737f
parentbe89251d636d02b384aa22c8fe2e6ea6876dc3a3
Merge branches 'pm-devfreq' and 'pm-tools'

* pm-devfreq:
  PM / devfreq: Define the constant governor name
  PM / devfreq: Remove unneeded conditional statement
  PM / devfreq: Show the all available frequencies
  PM / devfreq: Change return type of devfreq_set_freq_table()
  PM / devfreq: Use the available min/max frequency
  Revert "PM / devfreq: Add show_one macro to delete the duplicate code"
  PM / devfreq: Set min/max_freq when adding the devfreq device

* pm-tools:
  tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore
  tools/power/cpupower: Add 64 bit library detection
  MAINTAINERS: add maintainer for tools/power/cpupower
  cpupower: Fix no-rounding MHz frequency output
MAINTAINERS