From: Olof Johansson <olof@lixom.net>
Date: Sat, 23 Jun 2018 17:14:08 +0000 (-0700)
Subject: Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Tag: v5.15~8506^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a514338b94e8e9b5db51754ff69d2a7b1c70426e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.17 (part 2)

 - Use correct size for ICU nodes (irq controller) on Armada 7K/8K
 - Fix "#cooling-cells" property's name on Synology DS116 (Armada 385)

* tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu:
  arm: dts: armada: Fix "#cooling-cells" property's name
  arm64: dts: marvell: fix CP110 ICU node size

Signed-off-by: Olof Johansson <olof@lixom.net>
---

a514338b94e8e9b5db51754ff69d2a7b1c70426e