Merge tag 'linux-watchdog-5.0-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jan 2019 21:58:52 +0000 (09:58 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jan 2019 21:58:52 +0000 (09:58 +1200)
commitf403d718ebde2059de848ae7548392dfb25a13ae
tree43f8fb5b0da9c59a2cc80497b37fe15e00628630
parentb0efca46b57071e4c281034f04d2b56edf79843d
parent4a22fc534f2f55808c41197cf17d829099032acb
Merge tag 'linux-watchdog-5.0-rc-fixes' of git://linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

 - mt7621_wdt/rt2880_wdt: Fix compilation problem

 - tqmx86: Fix a couple IS_ERR() vs NULL bugs

* tag 'linux-watchdog-5.0-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: tqmx86: Fix a couple IS_ERR() vs NULL bugs
  watchdog: mt7621_wdt/rt2880_wdt: Fix compilation problem