Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:29:57 +0000 (21:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:29:57 +0000 (21:29 -0800)

Trivial merge