From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Fri, 8 Feb 2019 04:10:29 +0000 (+0530)
Subject: Merge branch 'cpufreq/qcom-hw' into cpufreq/arm/linux-next
X-Git-Tag: v5.1-rc1~151^2~1^2~1^2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af816ddfbdf049dfce251513af4b5dc903c9764c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'cpufreq/qcom-hw' into cpufreq/arm/linux-next
---

af816ddfbdf049dfce251513af4b5dc903c9764c
diff --cc MAINTAINERS
index f0400a4668705,4d04cebb4a712..b34df5d57cde6
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3958,8 -3957,10 +3958,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/