From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:41:39 +0000 (+0100)
Subject: Merge branches 'pm-devfreq' and 'pm-tools'
X-Git-Tag: v4.19~2229^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=990a848d537e4da966907c8ccec95bc568f2911c;p=platform%2Fkernel%2Flinux-rpi.git

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

990a848d537e4da966907c8ccec95bc568f2911c