projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4394a00 d4ac2cf)
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)
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>

Trivial merge