Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Feb 2014 22:34:26 +0000 (14:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Feb 2014 22:34:26 +0000 (14:34 -0800)
commit0a4e836a60c786a46bc5691c2aaf30da0a317651
tree99d1bea2100f8ae2f23e9c54d1900c1e647abdb4
parent34acae3ce3472f6365d5724252f82032bbc06d63
parent0cb1c3e853e0d0f996f4e11863407bf31e6b7343
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fix from Wim Van Sebroeck:
 "It corrects the error code when no device was found for w83697hf_wdt"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: w83697hf_wdt: return ENODEV if no device was found