Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Mar 2015 21:45:42 +0000 (14:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Mar 2015 21:45:42 +0000 (14:45 -0700)
commita39bdfb590f54d0f41d6a5b352b085322d007dcd
treead14ae871b0bba0449cb26a043163f04142d0986
parenta7fe850d3be88239ee1eaac6bea38e07a4b9e865
parentae6ee2fd47f76db5a1cd02c23378057bd21c2c8d
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

 - mtk_wdt: signedness bug in mtk_wdt_start()

 - imgpdc: Fix NULL pointer dereference during probe and fix the default
   heartbeat

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: imgpdc: Fix default heartbeat
  watchdog: imgpdc: Fix probe NULL pointer dereference
  watchdog: mtk_wdt: signedness bug in mtk_wdt_start()