diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-05 11:20:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-05 11:20:15 -0800 |
| commit | ed1741b77c162ad7087949fda39af4ec8c33e663 (patch) | |
| tree | deee5fd740f76f6bf5572ed251ff534d29d20522 /include | |
| parent | df48ab3c2f5ffca88b7803ffbadd074bd5a0a2ef (diff) | |
| parent | d42d6108711b142804b4710d4215efbf5f9b6e21 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This fixes several Kconfig dependencies, a compilation warning in
pcwd_usb, a failure to abort the sp805 wdt after a ping and the
max63xx wdt's MODULE_LICENSE"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Fix dependencies for !HAS_IOMEM archs
watchdog: imgdpc: select WATCHDOG_CORE
watchdog: tango: rename ARCH_TANGOX to ARCH_TANGO
watchdog: pcwd_usb: fix compilation warning
watchdog: sp805: ping fails to abort wdt reset
watchdog: max63xx: make module's license marker match the header
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions