Merge tag 'v4.12-rc7' into devel

Linux 4.12-rc7

diff --cc MAINTAINERS
index 178297dadb0f4edfd9f74bfed81623b13f91b8f6,09b5ab6a8a5ce8fd66bed85f30b9ca7db26c14c2..ccdcfbdeaa40b9ca0b6cfcd6e1bcf3985cd4d6db
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1489,14 -1489,15 +1489,16 @@@ M:   Gregory Clement <gregory.clement@fre
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
- F:    arch/arm/mach-mvebu/
- F:    drivers/rtc/rtc-armada38x.c
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
+ F:    arch/arm/configs/mvebu_*_defconfig
+ F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/mvebu-cpufreq.c
- F:    arch/arm/configs/mvebu_*_defconfig
+ F:    drivers/irqchip/irq-armada-370-xp.c
+ F:    drivers/irqchip/irq-mvebu-*
 +F:    drivers/pinctrl/mvebu/
+ F:    drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
  M:    Jisheng Zhang <jszhang@marvell.com>

diff --cc drivers/pinctrl/core.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-amd.c
Simple merge

diff --cc drivers/pinctrl/stm32/pinctrl-stm32.c
Simple merge