Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 13:44:04 +0000 (15:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 13:44:04 +0000 (15:44 +0200)
commitff83b377cb56875fb4daba63e2595d8c27d9204d
treefd6402139bf49ea8253e9b4545efb8d169866e96
parentb48e5aa6bc2eacf1f1b54bb6845963c8731f450f
parent517550075c31917dc729d7cec0b4a0ca65294f14
Merge tag 'at91-dt2' of git://git./linux/kernel/git/nferre/linux-at91 into next/dt

Merge "Second batch of DT changes for 4.7" from Nicolas Ferre:

- three low priority fixes:
  - sama5d2: one pin definition and dependency with the slow clock for watchdog
  - sama5d4: definition of watchdog IRQ property
- addition of the new shutdown controller to sama5d2 & sama5d2 Xplained

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sama5d2: add slow clock to watchdog node
  ARM: dts: at91: sama5d2: add shutdown controller node
  ARM: dts: at91: sama5d4: add watchdog interrupt property
  ARM: dts: at91: fix typo in sama5d2 PIN_PD24 description