| commit | a514338b94e8e9b5db51754ff69d2a7b1c70426e | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Jun 23 10:14:08 2018 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Jun 23 10:14:08 2018 -0700 |
| tree | 9a508516503493dc4a0863de992ebac1341e54c2 | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 [diff] | |
| parent | ac62cc9d9cd6fa4c79e171c13dc8d58c3862b678 [diff] |
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>