Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 12 Feb 2006 18:26:57 +0000 (10:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 12 Feb 2006 18:26:57 +0000 (10:26 -0800)

Trivial merge