Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt64
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 Jun 2017 12:29:17 +0000 (14:29 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 Jun 2017 12:29:17 +0000 (14:29 +0200)
commit9b3088135aba74c177529096a6925f3c0af077c2
tree5224732e2078bc35f64f7ea19e098381f693737e
parent30edd98b3b0edd0715ef736fd54d08a15cbc9462
parent44f73dc42c11398d7b84e94365a485ebd6420798
Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt64

mvebu fixes for 4.12

Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs

* tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi