diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-21 10:28:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-21 10:28:15 -0700 |
| commit | e46096b6a33a698100cbe923f6cf7f05cd5ad1ad (patch) | |
| tree | fd581c3e025ba6fcc952a11139c9ca20f49d9ef2 /MAINTAINERS | |
| parent | 6488ec263343337fdb090b15563864b293ce0340 (diff) | |
| parent | 49d4d277ca54e04170d39484c8758a0ea9bca37d (diff) | |
| download | blackbird-obmc-linux-e46096b6a33a698100cbe923f6cf7f05cd5ad1ad.tar.gz blackbird-obmc-linux-e46096b6a33a698100cbe923f6cf7f05cd5ad1ad.zip | |
Merge tag 'linux-watchdog-4.17-rc2' of git://www.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.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b7ff5654b8b5..6208fd1113a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6268,7 +6268,7 @@ S: Odd Fixes F: drivers/media/usb/hdpvr/ HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER -M: Jimmy Vance <jimmy.vance@hpe.com> +M: Jerry Hoemann <jerry.hoemann@hpe.com> S: Supported F: Documentation/watchdog/hpwdt.txt F: drivers/watchdog/hpwdt.c |
