From: Olof Johansson 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: v4.18-rc3~8^2~17 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a514338b94e8e9b5db51754ff69d2a7b1c70426e;p=linux-2.6-block.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 --- a514338b94e8e9b5db51754ff69d2a7b1c70426e