From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 13 Sep 2005 16:45:20 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: firefly_0821_release~41096
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8cd2e5045688157479a654786b2c08ab85f4d8f;p=firefly-linux-kernel-4.4.55.git

Merge /linux/kernel/git/wim/linux-2.6-watchdog
---

a8cd2e5045688157479a654786b2c08ab85f4d8f