From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Apr 2018 17:28:15 +0000 (-0700)
Subject: Merge tag 'linux-watchdog-4.17-rc2' of git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v4.19~1154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e46096b6a33a698100cbe923f6cf7f05cd5ad1ad;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'linux-watchdog-4.17-rc2' of git://linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

 - fall-through fixes

 - MAINTAINER change for hpwdt

 - renesas-wdt: Add support for WDIOF_CARDRESET

 - aspeed: set bootstatus during probe

* tag 'linux-watchdog-4.17-rc2' of git://www.linux-watchdog.org/linux-watchdog:
  aspeed: watchdog: Set bootstatus during probe
  watchdog: renesas-wdt: Add support for WDIOF_CARDRESET
  watchdog: wafer5823wdt: Mark expected switch fall-through
  watchdog: w83977f_wdt: Mark expected switch fall-through
  watchdog: sch311x_wdt: Mark expected switch fall-through
  watchdog: hpwdt: change maintainer.
---

e46096b6a33a698100cbe923f6cf7f05cd5ad1ad