Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'

* pm-opp:
  PM / OPP: do error handling at the bottom of dev_pm_opp_add_dynamic()
  PM / OPP: handle allocation of device_opp in a separate routine
  PM / OPP: reuse find_device_opp() instead of duplicating code
  PM / OPP: Staticize __dev_pm_opp_remove()
  PM / OPP: replace kfree with kfree_rcu while freeing 'struct device_opp'

* pm-cpufreq:
  MAINTAINERS: add entry for intel_pstate
  intel_pstate: Add a few comments
  intel_pstate: add kernel parameter to force loading

* pm-tools:
  Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"

diff --cc Documentation/kernel-parameters.txt
index eacb2e0,479f332,d006bb2,479f332..10b8cc1
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
--- 3/Documentation/kernel-parameters.txt
--- 4/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@@@ -1446,9 -1446,6 -1446,18 -1446,6 +1446,18 @@@@@ bytes respectively. Such letter suffixe
                       disable
                         Do not enable intel_pstate as the default
                         scaling driver for the supported processors
++ +                   force
++ +                     Enable intel_pstate on systems that prohibit it by default
++ +                     in favor of acpi-cpufreq. Forcing the intel_pstate driver
++ +                     instead of acpi-cpufreq may disable platform features, such
++ +                     as thermal controls and power capping, that rely on ACPI
++ +                     P-States information being indicated to OSPM and therefore
++ +                     should be used with caution. This option does not work with
++ +                     processors that aren't supported by the intel_pstate driver
++ +                     or on platforms that use pcc-cpufreq instead of acpi-cpufreq.
 + +                   no_hwp
 + +                     Do not enable hardware P state control (HWP)
 + +                     if available.
    
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)

diff --cc MAINTAINERS
Simple merge