diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 10:25:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 10:25:22 -0700 |
| commit | 5ecf3e110c32c5756351eed067cdf6a91c308e62 (patch) | |
| tree | ca93d93245620eda168fb70c141488918f2d8250 /MAINTAINERS | |
| parent | ed3f4e239834317934cc73a187e27e44b217056b (diff) | |
| parent | cd6ba41c192deca20d9add5554bc8c51d0f07de2 (diff) | |
Merge tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
- Add Armada 37xx CPU watchdog
- w83627hf_wdt: Add Support for NCT6796D, NCT6797D, NCT6798D
- hpwdt: several improvements
- renesas_wdt: SPDX identifiers, stop when unregistering, support for
R7S9210
- rza_wdt: SPDX identifiers, support longer timeouts
- core: fix null pointer dereference when releasing cdev
- iTCO_wdt: Drop option vendorsupport=2
- sama5d4: fix timeout-sec usage
- lantiq_wdt: convert to watchdog framework
- several small fixes
* tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits)
watchdog: ts4800: release syscon device node in ts4800_wdt_probe()
watchdog: armada_37xx_wdt: use do_div for u64 division
documentation: watchdog: add documentation for armada-37xx-wdt
dt-bindings: watchdog: Document armada-37xx-wdt binding
watchdog: Add support for Armada 37xx CPU watchdog
dt-bindings: watchdog: add mpc8xxx-wdt support
watchdog: mpc8xxx: provide boot status
MAINTAINERS: Fix file pattern for MEN Z069 watchdog driver
dt-bindings: watchdog: renesas-wdt: Add support for R7S9210
watchdog: rza_wdt: Support longer timeouts
watchdog: hpwdt: Disable PreTimeout when Timeout is smaller
watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D
watchdog: mpc8xxx: use dev_xxxx() instead of pr_xxxx()
watchdog: lantiq: add get_timeleft callback
watchdog: lantiq: Convert to watchdog_device
watchdog: lantiq: update register names to better match spec
watchdog: sama5d4: fix timeout-sec usage
watchdog: fix a small number of "watchog" typos in comments
watchdog: rza_wdt: convert to SPDX identifiers
watchdog: iTCO_wdt: Remove unused hooks
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 30cd3c4d8c7d..bfc9722a4932 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9568,7 +9568,7 @@ MEN Z069 WATCHDOG DRIVER M: Johannes Thumshirn <jth@kernel.org> L: linux-watchdog@vger.kernel.org S: Maintained -F: drivers/watchdog/menz069_wdt.c +F: drivers/watchdog/menz69_wdt.c MESON AO CEC DRIVER FOR AMLOGIC SOCS M: Neil Armstrong <narmstrong@baylibre.com> |