Merge branches 'pm-sleep' and 'pm-domains'

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index efbcb50e496954934295b3147e1de9dbdd05ff9e..83f9bb3eaf3652702903bbe74343be0858979d01 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4312,6 +4312,15 @@ S:       Supported
 F:     drivers/phy/
 F:     include/linux/phy/
 
+GENERIC PM DOMAINS
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:     Kevin Hilman <khilman@kernel.org>
+M:     Ulf Hansson <ulf.hansson@linaro.org>
+L:     linux-pm@vger.kernel.org
+S:     Supported
+F:     drivers/base/power/domain*.c
+F:     include/linux/pm_domain.h
+
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 L:     kvm@vger.kernel.org