Merge branches 'pm-sleep' and 'pm-tools'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 233f83464814f138c4c68f0815d2dbeace552ef6..ce97e97b8dcfe88134d1a62eaf555b3c8e6881ee 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8447,6 +8447,17 @@ F:       fs/timerfd.c
 F:     include/linux/timer*
 F:     kernel/time/*timer*
 
+POWER MANAGEMENT CORE
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+L:     linux-pm@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+S:     Supported
+F:     drivers/base/power/
+F:     include/linux/pm.h
+F:     include/linux/pm_*
+F:     include/linux/powercap.h
+F:     drivers/powercap/
+
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>