Merge branches 'pm-pci' and 'pm-core'

[linux-beck.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6889a6dbb42ddfb19531cc7687eae048346b9244..ce97e97b8dcfe88134d1a62eaf555b3c8e6881ee 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8380,6 +8380,14 @@ L:       linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pinctrl/samsung/
 
+PIN CONTROLLER - SINGLE
+M:     Tony Lindgren <tony@atomide.com>
+M:     Haojian Zhuang <haojian.zhuang@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/pinctrl/pinctrl-single.c
+
 PIN CONTROLLER - ST SPEAR
 M:     Viresh Kumar <vireshk@kernel.org>
 L:     spear-devel@list.st.com
@@ -8439,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>