Merge tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu into next/fixes...
authorArnd Bergmann <arnd@arndb.de>
Mon, 3 Jul 2017 12:09:06 +0000 (14:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 3 Jul 2017 12:09:06 +0000 (14:09 +0200)
commitff9e0e3b091291a6694c52074940c5fabd693467
treecf70ec1e024df522f48a94556f82337390ff31f5
parent0281bafa39198be39283543c90e490545901e1a5
parent4fcee14d3802b60f22baf1aeab9f1cff08834c56
Merge tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical

mvebu fixes for 4.12 (part 2)

Fix Openblock A6 (kirkwood base board) nand partition overlap

* tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes