diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 15:44:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 15:44:04 +0200 |
| commit | ff83b377cb56875fb4daba63e2595d8c27d9204d (patch) | |
| tree | fd6402139bf49ea8253e9b4545efb8d169866e96 /ipc | |
| parent | b48e5aa6bc2eacf1f1b54bb6845963c8731f450f (diff) | |
| parent | 517550075c31917dc729d7cec0b4a0ca65294f14 (diff) | |
| download | linux-ff83b377cb56875fb4daba63e2595d8c27d9204d.tar.bz2 | |
Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'ipc')
0 files changed, 0 insertions, 0 deletions