Merge branch 'watchdog-fix' into fixes

This commit is contained in:
Tony Lindgren 2019-10-18 08:47:39 -07:00
commit 6aed5a0e0f