Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 1 Jun 2017 23:56:06 +0000 (16:56 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 2 Jun 2017 00:07:38 +0000 (17:07 -0700)
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: (316 commits)
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
  + Linux 4.12-rc2

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

diff --cc MAINTAINERS
Simple merge