Merge branch 'devel' into for-next

diff --cc drivers/pinctrl/Kconfig
index d96caefd914a90d2db11f05278f565a7e7cc79ee,b088ac22146717ecaf63328739bc8c9c06bf04e3..5f2f9dc43e3bca1a66910721276dc45059d69e60
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -185,30 -184,9 +185,10 @@@ config PINCTRL_SAMSUN
  
  config PINCTRL_EXYNOS4
        bool "Pinctrl driver data for Exynos4 SoC"
 +      depends on OF && GPIOLIB
        select PINCTRL_SAMSUNG
  
- config PINCTRL_MVEBU
-       bool
-       depends on ARCH_MVEBU
-       select PINMUX
-       select PINCONF
- 
- config PINCTRL_DOVE
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_KIRKWOOD
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_370
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_XP
-       bool
-       select PINCTRL_MVEBU
+ source "drivers/pinctrl/mvebu/Kconfig"
  
  source "drivers/pinctrl/spear/Kconfig"