diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 22:02:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 22:02:49 +0100 |
| commit | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (patch) | |
| tree | cfca0dc266a6e4b8eaf6da5a54d2618cf88d010a /net/dccp/output.c | |
| parent | Merge tag 'char-misc-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | watchdog: da9062: Add dependency on I2C (diff) | |
| download | linux-0c0ddd6ae47c9238c18f475bcca675ca74c9dc31.tar.xz linux-0c0ddd6ae47c9238c18f475bcca675ca74c9dc31.zip | |
Merge tag 'linux-watchdog-5.6-rc3' of git://www.linux-watchdog.org/linux-watchdog
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
Diffstat (limited to 'net/dccp/output.c')
0 files changed, 0 insertions, 0 deletions