From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2018 00:27:42 +0000 (-0700)
Subject: Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.18-rc6~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=45ae4df9220701071ffec057d4b0071943022ab3;p=users%2Fdwmw2%2Flinux.git

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:

 - Fix interrupt type on ethernet switch for i.MX-based RDU2

 - GPC on i.MX exposed too large a register window which resulted in
   userspace being able to crash the machine.

 - Fixup of bad merge resolution moving GPIO DT nodes under pinctrl on
   droid4.

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: imx6: RDU2: fix irq type for mv88e6xxx switch
  soc: imx: gpc: restrict register range for regmap access
  ARM: dts: omap4-droid4: fix dts w.r.t. pwm
---

45ae4df9220701071ffec057d4b0071943022ab3