Merge remote-tracking branch 'cpufreq-arm/cpufreq/arm/linux-next'

diff --cc MAINTAINERS
index 9cd7ff5,f0400a4..29b1e55
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3975,10 -3958,8 +3976,10 @@@ M:    Viresh Kumar <viresh.kumar@linaro.or
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
- T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
  B:    https://bugzilla.kernel.org
 +F:    Documentation/admin-guide/pm/cpufreq.rst
 +F:    Documentation/admin-guide/pm/intel_pstate.rst
  F:    Documentation/cpu-freq/
  F:    Documentation/devicetree/bindings/cpufreq/
  F:    drivers/cpufreq/

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/cpufreq/qcom-cpufreq-hw.c
Simple merge

diff --cc drivers/cpufreq/tegra124-cpufreq.c
index ba3795e,4bb154f..5e748c8
--- 1/drivers/cpufreq/tegra124-cpufreq.c
--- 2/drivers/cpufreq/tegra124-cpufreq.c
+++ b/drivers/cpufreq/tegra124-cpufreq.c
@@@ -118,8 -134,12 +118,10 @@@ static int tegra124_cpufreq_probe(struc
  
        platform_set_drvdata(pdev, priv);
  
+       of_node_put(np);
+ 
        return 0;
  
 -out_switch_to_pllx:
 -      tegra124_cpu_switch_to_pllx(priv);
  out_put_pllp_clk:
        clk_put(priv->pllp_clk);
  out_put_pllx_clk:

diff --cc drivers/opp/core.c
Simple merge

diff --cc drivers/opp/of.c
Simple merge

diff --cc include/linux/pm_opp.h
Simple merge