www.infradead.org Git - users/jedix/linux-maple.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 21 Feb 2020 21:02:49 +0000 (13:02 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 21 Feb 2020 21:02:49 +0000 (13:02 -0800)

Pull watchdog fixes from Wim Van Sebroeck:

- mtk_wdt needs RESET_CONTROLLER to build

- da9062 driver fixes:
     - fix power management ops
     - do not ping the hw during stop()
     - add dependency on I2C

* tag 'linux-watchdog-5.6-rc3' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: da9062: Add dependency on I2C
  watchdog: da9062: fix power management ops
  watchdog: da9062: do not ping the hw during stop()
  watchdog: fix mtk_wdt.c RESET_CONTROLLER build error

Trivial merge