From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 29 Jun 2017 12:27:39 +0000 (+0200)
Subject: Merge tag 'v4.12-rc7' into devel
X-Git-Tag: v4.13-rc1~139^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=61830619675b97d3da34c59c71ae51646a205e2c;p=linux.git

Merge tag 'v4.12-rc7' into devel

Linux 4.12-rc7
---

61830619675b97d3da34c59c71ae51646a205e2c
diff --cc MAINTAINERS
index 178297dadb0f,09b5ab6a8a5c..ccdcfbdeaa40
--- a/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:	drivers/irqchip/irq-armada-370-xp.c
+ F:	drivers/irqchip/irq-mvebu-*
 +F:	drivers/pinctrl/mvebu/
- F:	arch/arm/configs/mvebu_*_defconfig
+ F:	drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
  M:	Jisheng Zhang <jszhang@marvell.com>