Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4b79094..742413f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2528,8 +2528,7 @@ M:        Steve French <sfrench@samba.org>
 L:     linux-cifs@vger.kernel.org
 L:     samba-technical@lists.samba.org (moderated for non-subscribers)
 W:     http://linux-cifs.samba.org/
-Q:     http://patchwork.ozlabs.org/project/linux-cifs-client/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
+T:     git git://git.samba.org/sfrench/cifs-2.6.git
 S:     Supported
 F:     Documentation/filesystems/cifs/
 F:     fs/cifs/
@@ -2656,6 +2655,16 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 S:     Maintained
 F:     drivers/cpuidle/cpuidle-big_little.c
 
+CPUIDLE DRIVER - ARM EXYNOS
+M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+M:     Daniel Lezcano <daniel.lezcano@linaro.org>
+M:     Kukjin Kim <kgene@kernel.org>
+L:     linux-pm@vger.kernel.org
+L:     linux-samsung-soc@vger.kernel.org
+S:     Supported
+F:     drivers/cpuidle/cpuidle-exynos.c
+F:     arch/arm/mach-exynos/pm.c
+
 CPUIDLE DRIVERS
 M:     Rafael J. Wysocki <rjw@rjwysocki.net>
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
@@ -7087,6 +7096,16 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/pci/xgene-pci.txt
 F:     drivers/pci/host/pci-xgene.c
 
+PCI DRIVER FOR FREESCALE LAYERSCAPE
+M:     Minghuan Lian <minghuan.Lian@freescale.com>
+M:     Mingkai Hu <mingkai.hu@freescale.com>
+M:     Roy Zang <tie-fei.zang@freescale.com>
+L:     linuxppc-dev@lists.ozlabs.org
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     drivers/pci/host/*layerscape*
+
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
 M:     Lucas Stach <l.stach@pengutronix.de>
@@ -7266,7 +7285,13 @@ PIN CONTROLLER - ATMEL AT91
 M:     Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/pinctrl/pinctrl-at91.c
+F:     drivers/pinctrl/pinctrl-at91.*
+
+PIN CONTROLLER - INTEL
+M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
+S:     Maintained
+F:     drivers/pinctrl/intel/
 
 PIN CONTROLLER - RENESAS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>