From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 25 Sep 2015 01:28:24 +0000 (+1000)
Subject: Merge remote-tracking branch 'watchdog/master'
X-Git-Tag: next-20150925~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf326ba63c65eec8d517555a5d28b6fde00e288f;hp=-c;p=uclinux-h8%2Flinux.git

Merge remote-tracking branch 'watchdog/master'
---

cf326ba63c65eec8d517555a5d28b6fde00e288f