Merge branch 'spear/pinctrl' into spear/clock

Conflicts:
	arch/arm/mach-spear3xx/Makefile
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear6xx/clock.c
	arch/arm/plat-spear/Makefile
	drivers/pinctrl/core.c

This resolves some annoying merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 8 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cb5425e3cd42..27085a75162f 100644
--- 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