Merge tag 'acpi-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ff146d4677ed8a92b0489db2bbcf2c9aa0d59a4..c570f0204b48d3e575ae68bc8afbb9603388a589 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3548,7 +3548,7 @@ BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
 M:     Chanwoo Choi <cw00.choi@samsung.com>
 L:     linux-pm@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Maintained
 F:     drivers/devfreq/exynos-bus.c
 F:     Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -4282,14 +4282,13 @@ F:      include/linux/cpufreq.h
 F:     include/linux/sched/cpufreq.h
 F:     tools/testing/selftests/cpufreq/
 
-CPU FREQUENCY DRIVERS - ARM BIG LITTLE
+CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-pm@vger.kernel.org
 W:     http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:     Maintained
-F:     drivers/cpufreq/arm_big_little.h
-F:     drivers/cpufreq/arm_big_little.c
+F:     drivers/cpufreq/vexpress-spc-cpufreq.c
 
 CPU POWER MONITORING SUBSYSTEM
 M:     Thomas Renninger <trenn@suse.com>
@@ -4774,9 +4773,9 @@ F:        include/linux/devcoredump.h
 DEVICE FREQUENCY (DEVFREQ)
 M:     MyungJoo Ham <myungjoo.ham@samsung.com>
 M:     Kyungmin Park <kyungmin.park@samsung.com>
-R:     Chanwoo Choi <cw00.choi@samsung.com>
+M:     Chanwoo Choi <cw00.choi@samsung.com>
 L:     linux-pm@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Maintained
 F:     drivers/devfreq/
 F:     include/linux/devfreq.h
@@ -4786,10 +4785,11 @@ F:      include/trace/events/devfreq.h
 DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
 M:     Chanwoo Choi <cw00.choi@samsung.com>
 L:     linux-pm@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Supported
 F:     drivers/devfreq/event/
 F:     drivers/devfreq/devfreq-event.c
+F:     include/dt-bindings/pmu/exynos_ppmu.h
 F:     include/linux/devfreq-event.h
 F:     Documentation/devicetree/bindings/devfreq/event/
 
@@ -13076,6 +13076,15 @@ L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/pm8001/
 
+PM-GRAPH UTILITY
+M:     "Todd E Brandt" <todd.e.brandt@linux.intel.com>
+L:     linux-pm@vger.kernel.org
+W:     https://01.org/pm-graph
+B:     https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
+T:     git git://github.com/intel/pm-graph
+S:     Supported
+F:     tools/power/pm-graph
+
 PNP SUPPORT
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:     Maintained