From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 8 Oct 2005 21:58:25 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.14-rc4~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58a2c3221e3c78ea6c71148eb84d4170358981fb;p=linux-2.6-omap-h63xx.git

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

58a2c3221e3c78ea6c71148eb84d4170358981fb