Merge branch 'spear/pinctrl' into spear/clock

[can-eth-gw-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cb5425e3cd424bc0a16018db113904f3768e39ed..27085a75162f3ae6cb49a77397026a5e3134b946 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5244,6 +5244,14 @@ M:       Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
 F:     drivers/pinctrl/
 
+PIN CONTROLLER - ST SPEAR
+M:     Viresh Kumar <viresh.kumar@st.com>
+L:     spear-devel@list.st.com
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:     http://www.st.com/spear
+S:     Maintained
+F:     driver/pinctrl/spear/
+
 PKTCDVD DRIVER
 M:     Peter Osterlund <petero2@telia.com>
 S:     Maintained
@@ -6338,21 +6346,6 @@ W:       http://www.st.com/spear
 S:     Maintained
 F:     drivers/clk/spear/
 
-SPEAR PAD MULTIPLEXING SUPPORT
-M:     Viresh Kumar <viresh.kumar@st.com>
-L:     spear-devel@list.st.com
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
-S:     Maintained
-F:     arch/arm/plat-spear/include/plat/padmux.h
-F:     arch/arm/plat-spear/padmux.c
-F:     arch/arm/mach-spear*/spear*xx.c
-F:     arch/arm/mach-spear*/include/mach/generic.h
-F:     arch/arm/mach-spear3xx/spear3*0.c
-F:     arch/arm/mach-spear3xx/spear3*0_evb.c
-F:     arch/arm/mach-spear6xx/spear600.c
-F:     arch/arm/mach-spear6xx/spear600_evb.c
-
 SPI SUBSYSTEM
 M:     Grant Likely <grant.likely@secretlab.ca>
 L:     spi-devel-general@lists.sourceforge.net