Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 8 Oct 2014 19:19:21 +0000 (21:19 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 8 Oct 2014 19:19:21 +0000 (21:19 +0200)
commitee48874d4aa50d9c4921b44a38dc33110b90638b
tree6cc7f4d2de006f5f44110f805fb92db975b4637b
parent4394a0014597bd53e2d9bbc69d091e3fbde7d00c
parentd4ac2cfea724d3874ce3f1f624bcd40e78b1a9d4
Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into next/dt

Merge "Meson6 WDT support" from Carlo Caione:

This patch adds the support for the Meson6 watchdog in the DTSI

* tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson:
  ARM: DTS: meson: update DTSI to add watchdog node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>