Merge branch 'watchdog-fix' into fixes
authorTony Lindgren <tony@atomide.com>
Fri, 18 Oct 2019 15:47:39 +0000 (08:47 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Oct 2019 15:47:39 +0000 (08:47 -0700)

Trivial merge