diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-10 19:17:59 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-10 19:17:59 +0100 |
commit | 23b33acc5fe6e703ae76210b08d3848e0a4683ab (patch) | |
tree | 98739487a8b4e69eef77a28beacd1c70d03c01fb /arch/arm/mach-ixp4xx/Makefile | |
parent | Merge tag 'for-linus-20180309' of git://git.kernel.dk/linux-block (diff) | |
parent | watchdog: hpwdt: Remove legacy NMI sourcing. (diff) | |
download | linux-23b33acc5fe6e703ae76210b08d3848e0a4683ab.tar.xz linux-23b33acc5fe6e703ae76210b08d3848e0a4683ab.zip |
Merge tag 'linux-watchdog-4.16-fixes-2' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
- f71808e_wdt: Fix magic close handling
- sbsa: 32-bit read fix for WCV
- hpwdt: Remove legacy NMI sourcing
* tag 'linux-watchdog-4.16-fixes-2' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: hpwdt: Remove legacy NMI sourcing.
watchdog: sbsa: use 32-bit read for WCV
watchdog: f71808e_wdt: Fix magic close handling
Diffstat (limited to 'arch/arm/mach-ixp4xx/Makefile')
0 files changed, 0 insertions, 0 deletions