From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 2 Nov 2005 05:29:57 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.15-rc1~18^2~34
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e016b9fa134d79341cca5e336ccbcea066d5f81;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
---

0e016b9fa134d79341cca5e336ccbcea066d5f81